diff --git a/classes/minion/migration/util.php b/classes/minion/migration/util.php
index 1890acf..47caeb2 100644
--- a/classes/minion/migration/util.php
+++ b/classes/minion/migration/util.php
@@ -61,9 +61,16 @@ class Minion_Migration_Util {
 		// path from the migrations folder to the migration file
 		$migration['group'] = dirname(substr($file, 11, -strlen(EXT)));
 
-		list($migration['timestamp'], $migration['description']) 
-			= explode('_', basename($file, EXT), 2);
-
+		if(strpos(basename($file), "_"))
+		{
+			list($migration['timestamp'], $migration['description']) 
+				= explode('_', basename($file, EXT), 2);
+		}
+		else
+		{
+			$migration['timestamp'] = basename($file, EXT);
+			$migration['description'] = "";
+		}
 		$migration['id'] = $migration['group'].':'.$migration['timestamp'];
 
 		return $migration;
@@ -79,7 +86,15 @@ class Minion_Migration_Util {
 	public static function get_filename_from_migration(array $migration)
 	{
 		$group  = $migration['group'];
-		$migration = $migration['timestamp'].'_'.$migration['description'];
+
+		if(!empty($migration['description']))
+		{
+			$migration = $migration['timestamp'].'_'.$migration['description'];
+		}
+		else
+		{
+			$migration = $migration['timestamp'];
+		}
 
 		$group = ( ! empty($group)) ? (rtrim($group, '/').'/') : '';
 
diff --git a/views/minion/task/db/migrate/exception.php b/views/minion/task/db/migrate/exception.php
index 9a252f3..c5ed39a 100644
--- a/views/minion/task/db/migrate/exception.php
+++ b/views/minion/task/db/migrate/exception.php
@@ -1,3 +1,3 @@
-Minion encountered an error while executing migration `<?php echo $migration['id']; ?>` (<?php echo $migration['description'] ?>):
+Minion encountered an error while executing migration `<?php echo $migration['id']; ?>` <?php echo (!empty($migration['description']) ? '('.$migration['description'].')' : '') ?>):
 
 <?php echo $error; ?>
diff --git a/views/minion/task/db/status.php b/views/minion/task/db/status.php
index f9a17f4..98b0f1c 100644
--- a/views/minion/task/db/status.php
+++ b/views/minion/task/db/status.php
@@ -1,4 +1,4 @@
 <?php foreach($groups as $group => $status): ?>
- * <?php echo $group ?> <?php echo ($status !== NULL ? $status['timestamp'].' ('.$status['description'].')' : 'Not installed'); ?>
+ * <?php echo $group ?> <?php echo ($status !== NULL ? $status['timestamp'].' '.( !empty($status['description']) ? '('.$status['description'].')' : '' ) : 'Not installed'); ?>
 
 <?php endforeach; ?>