diff --git a/checkin_notes b/checkin_notes
index 9d90a32071..fbbc38315a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6181,3 +6181,12 @@ David  1 July 2009
 
     sched/
         pymw_assimilator.py
+
+David  6 July 2009
+    - fix client simulator
+    - web: if DB server down, say so
+
+    client/
+        sim_util.cpp
+    html/inc/
+        boinc_db.inc
diff --git a/client/sim_util.cpp b/client/sim_util.cpp
index 1ed9b9d91a..fb307775f6 100644
--- a/client/sim_util.cpp
+++ b/client/sim_util.cpp
@@ -31,6 +31,8 @@
 // If dirs are specified, chdir into each directory in sequence,
 // do the above for each one, and write summary info to stdout
 
+#include <math.h>
+
 #include "error_numbers.h"
 #include "str_util.h"
 #include "str_replace.h"
@@ -284,7 +286,6 @@ ACTIVE_TASK::ACTIVE_TASK() {
     graphics_mode_ack_timeout = 0;
     quit_time = 0;
     fraction_done = 0;
-    episode_start_cpu_time = 0;
     run_interval_start_wall_time = gstate.now;
     checkpoint_cpu_time = 0;
     checkpoint_wall_time = 0;
diff --git a/html/inc/boinc_db.inc b/html/inc/boinc_db.inc
index 6ba6a5a974..ff91e8762d 100644
--- a/html/inc/boinc_db.inc
+++ b/html/inc/boinc_db.inc
@@ -64,12 +64,20 @@ class BoincDb extends DbConn {
     static function get($readonly = false) {
         if (!isset(self::$instance)) {
             if (web_stopped()) {
-                show_page("Project down for maintenence",
+                show_page("Project down for maintenance",
                     "Please check back in a few hours."
                 );
                 exit;
             }
             self::get_aux($readonly);
+            if (!self::$instance) {
+                show_page(
+                    "Project is down",
+                    "The project's database server is down.
+                    Please check back in a few hours."
+                );
+                exit;
+            }
         }
         return self::$instance;
     }