diff --git a/src/image/ImageManager.cc b/src/image/ImageManager.cc
index c71f931aa6..35881d62db 100644
--- a/src/image/ImageManager.cc
+++ b/src/image/ImageManager.cc
@@ -139,7 +139,7 @@ void ImageManager::do_action(const string &action, void * arg)
 void ImageManager::timer_action()
 {
     static int mark = 0;
-    static int tics = 0;
+    static int tics = monitor_period;
 
     mark += timer_period;
     tics += timer_period;
@@ -196,6 +196,14 @@ void ImageManager::monitor_datastore(int ds_id)
 
     const ImageManagerDriver* imd = get();
 
+    if ( imd == 0 )
+    {
+        oss << "Error getting ImageManagerDriver";
+
+        NebulaLog::log("InM", Log::ERROR, oss);
+        return;
+    }
+
     Datastore * ds = dspool->get(ds_id, true);
 
     if ( ds == 0 )