--- a/aws/awsStartup.sh
+++ b/aws/awsStartup.sh
@@ -23,7 +23,7 @@
 psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
 #createuser transitdata -SDRP
 #password transitdata
-#psql -c \"GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;\"
+#psql -d transitdata -c \"GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;\"
 php /var/www/updatedb.php
 
 wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \

--- a/include/common-db.inc.php
+++ b/include/common-db.inc.php
@@ -1,10 +1,13 @@
 <?php
-  if ($isDebugServer) $conn = pg_connect("dbname=transitdata user=postgres password=snmc");
-  else $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata ");
-  if (php_uname('n') == "actbus-www") $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata host=db.actbus.dotcloud.com port=2242");
+  if (php_uname('n') == "actbus-www") {
+    $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata host=db.actbus.dotcloud.com port=2242");
+  } else if (isDebugServer()) {
+    $conn = pg_connect("dbname=transitdata user=postgres password=snmc");
+  } else {
+    $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata ");
+  }
   if (!$conn) {
-      echo "An error occured.\n";
-      exit;
+      die("A database error occurred.\n");
   }
   
   function databaseError($errMsg) {