diff --git a/common.py b/common.py
index e342d8cf..55f998bf 100755
--- a/common.py
+++ b/common.py
@@ -442,9 +442,9 @@ class ExecutionStateGatherer(object):
         self.revision = ""
         self.rinf = []
         self.tt = TestTable()
+        self.switch_revision("undefined")
 
     def switch_revision(self, revision):
-        print "Switching revision to " + revision
         self.revision = revision
         self.rinf.append(RevisionInfo(self.hostname, self.revision))
 
diff --git a/run_tests.py b/run_tests.py
index eb39b188..8644545a 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -729,22 +729,28 @@ def run_tests(options1, args, print_version):
     else:
         opt = "-O2"
 
-    common.ex_state.add_to_rinf_testall(total_tests)
-    for fname in skip_files:
-        # We do not add skipped tests to test table as we do not know the test result
-        common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 0, 1)
+    try:
+        common.ex_state.add_to_rinf_testall(total_tests)
+        for fname in skip_files:
+            # We do not add skipped tests to test table as we do not know the test result
+            common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 0, 1)
 
-    for fname in compile_error_files:
-        common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 1)
-        common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 1, 0)
+        for fname in compile_error_files:
+            common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 1)
+            common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 1, 0)
+
+        for fname in run_error_files:
+            common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 1, 0)
+            common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 1, 0, 0)
+
+        for fname in run_succeed_files:
+            common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 0)
+            common.ex_state.add_to_rinf(options.arch, opt, options.target, 1, 0, 0, 0)
+    
+    except:
+        print_debug("Exception in ex_state. Skipping...", s, run_tests_log)
 
-    for fname in run_error_files:
-        common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 1, 0)
-        common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 1, 0, 0)
 
-    for fname in run_succeed_files:
-        common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 0)
-        common.ex_state.add_to_rinf(options.arch, opt, options.target, 1, 0, 0, 0)
 
     for jb in task_threads:
         if not jb.exitcode == 0: