--- a/include/common-db.inc.php
+++ b/include/common-db.inc.php
@@ -1,13 +1,15 @@
 <?php
   if (php_uname('n') == "actbus-www") {
     $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata host=bus-main.lambdacomplex.org");
-  } else if (isDebugServer()) {
+  } 
+  if (isDebugServer()) {
     $conn = pg_connect("dbname=transitdata user=postgres password=snmc");
-  } else {
+  } 
+  if (strstr(php_uname('n'),"ip-10")){
     $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata ");
   }
   if (!$conn) {
-      die("A database error occurred.\n");
+      die("A database error occurred on ".php_uname('n')."\n");
   }
   
   function databaseError($errMsg) {