diff --git a/scripts/build/TestImpactAnalysis/tiaf.py b/scripts/build/TestImpactAnalysis/tiaf.py
index 5ae76d8269..304982a84d 100644
--- a/scripts/build/TestImpactAnalysis/tiaf.py
+++ b/scripts/build/TestImpactAnalysis/tiaf.py
@@ -93,7 +93,7 @@ class TestImpact:
                 self.__has_src_commit = True
 
     def __write_last_run_hash(self, last_run_hash):
-        os.mkdir(self.__historic_workspace)
+        os.makedirs(self.__historic_workspace, exist_ok=True)
         f = open(self.__last_commit_hash_path, "w")
         f.write(last_run_hash)
         f.close()
diff --git a/scripts/build/TestImpactAnalysis/tiaf_driver.py b/scripts/build/TestImpactAnalysis/tiaf_driver.py
index a9be7c8cbc..42234f803d 100644
--- a/scripts/build/TestImpactAnalysis/tiaf_driver.py
+++ b/scripts/build/TestImpactAnalysis/tiaf_driver.py
@@ -60,6 +60,6 @@ if __name__ == "__main__":
         # Non-gating will be removed from this script and handled at the job level in SPEC-7413
         #sys.exit(return_code)
         sys.exit(0)
-    except:
+    except Exception as e:
         # Non-gating will be removed from this script and handled at the job level in SPEC-7413
-        sys.exit(0)
\ No newline at end of file
+        print(f"Exception caught by TIAF driver: {e}")