diff --git a/server/gtest_runner.py b/server/gtest_runner.py
index 42955e8..c78f66c 100644
--- a/server/gtest_runner.py
+++ b/server/gtest_runner.py
@@ -53,8 +53,10 @@
         if self._gtest.validate(attribute_set):
             logging.info('%s %s Running %s', self._host,
                          [a for a in attribute_set], self._gtest)
-            self._gtest.run_test(client_autotest, self._results_dir)
-            self.parse()
+            try:
+                self._gtest.run_test(client_autotest, self._results_dir)
+            finally:
+                self.parse()
         else:
             self.record_failed_test(self._gtest.test_name,
                                     'No machines found for: ' + self._gtest)