diff --git a/supervisor.py b/supervisor.py
index aa2f227..3c243a6 100644
--- a/supervisor.py
+++ b/supervisor.py
@@ -224,11 +224,19 @@ def watch_folder():
     
 def main():
     while(True):
-        queue = update_queue()
+        try:
+            queue = update_queue()
+        except Exception:
+                print('ERROR: while updating work queue. Resuming.')
+                continue
         if not queue:
             watch_folder()
             continue
-        run(queue.pop()['expe_file'])
+        try:
+            run(queue.pop()['expe_file'])
+        except Exception:
+            print('ERROR: while running test. Resuming.')
+            continue
     
 if __name__ == '__main__':
     main()
\ No newline at end of file