diff --git a/core/ManifestBuilder.php b/core/ManifestBuilder.php
index 2d882f117..f5f436823 100644
--- a/core/ManifestBuilder.php
+++ b/core/ManifestBuilder.php
@@ -119,17 +119,14 @@ class ManifestBuilder {
 		$manifest .= "\$_CSS_MANIFEST = " . var_export($cssManifest, true) . ";\n";
 		DB::connect($databaseConfig);
 
-		if(DB::isActive()) {
-			// Database manifest				
-			$allClasses = ManifestBuilder::allClasses($classManifest);
+		// Database manifest				
+		$allClasses = ManifestBuilder::allClasses($classManifest);
 
-			$manifest .= "\$_ALL_CLASSES = " . var_export($allClasses, true) . ";\n";
+		$manifest .= "\$_ALL_CLASSES = " . var_export($allClasses, true) . ";\n";
+
+		global $_ALL_CLASSES;
+		$_ALL_CLASSES = $allClasses;
 
-			global $_ALL_CLASSES;
-			$_ALL_CLASSES = $allClasses;
-		} else {
-			if(!isset($_REQUEST['from_installer'])) echo '<li>Waiting until the database is created before compiling the manifest</li>';
-		}
 		// Write manifest to disk
 		$manifest = "<?php\n$manifest\n?>";
 
@@ -201,7 +198,14 @@ class ManifestBuilder {
 			$b = basename($file);
 			if($b != 'cli-script.php' && $b != 'main.php') include_once($file);
 		}
-		$tables = DB::getConn()->tableList();
+		
+		if(DB::isActive()) {
+			$tables = DB::getConn()->tableList();
+		} else {
+			$tables = array();
+		}
+		
+		$allClasses['hastable'] = array();
 		
 		// Build a map of classes and their subclasses
 		$_classes = get_declared_classes();
diff --git a/core/model/DatabaseAdmin.php b/core/model/DatabaseAdmin.php
index 84b2050c4..777cd8d16 100644
--- a/core/model/DatabaseAdmin.php
+++ b/core/model/DatabaseAdmin.php
@@ -136,6 +136,7 @@ class DatabaseAdmin extends Controller {
 				echo '<p><b>Creating database</b></p>';
 			}
 			DB::createDatabase();
+			// ManifestBuilder::compileManifest();
 		}
 
 		// Get all our classes
@@ -149,7 +150,7 @@ class DatabaseAdmin extends Controller {
 		if(!$quiet) {
 			echo '<p><b>Creating database tables</b></p>';
 		}
-		
+
 		$conn->beginSchemaUpdate();
 		foreach($dataClasses as $dataClass) {
 			// Test_ indicates that it's the data class is part of testing system