diff --git a/dispatcher/MongoConnect.py b/dispatcher/MongoConnect.py
index f45558d4..f84e45cb 100644
--- a/dispatcher/MongoConnect.py
+++ b/dispatcher/MongoConnect.py
@@ -328,8 +328,6 @@ def GetRunMode(self, mode):
                             del incdoc[field]
                     newdoc.update(incdoc)
             return newdoc
-        except NotMasterError:
-            self.log.error('Database snafu')
         except Exception as E:
             # LOG ERROR
             self.log.error("Got a %s exception in doc pulling: %s" % (type(E), E))
diff --git a/dispatcher/config.ini b/dispatcher/config.ini
index 4ea3c28a..5e971596 100644
--- a/dispatcher/config.ini
+++ b/dispatcher/config.ini
@@ -10,7 +10,7 @@ ArmTimeout = 40
 
 # How long since a client's last check-in until we consider
 # it to be 'timing out'
-ClientTimeout = 10
+ClientTimeout = 15
 
 # Database URIs. Please store DB password in the MONGO_PASSWORD
 # environment variable and runs DB password as RUNS_MONGO_PASSWORD