diff --git a/open_pdks/build-info.py b/open_pdks/build-info.py
index 1e085d4..787e442 100755
--- a/open_pdks/build-info.py
+++ b/open_pdks/build-info.py
@@ -48,10 +48,14 @@
 out_version = [0, 0, 0, 0]
 for k in versions:
     # Make sure that we have tags.
-    subprocess.check_call(
-        GIT_FETCH_TAGS.split(),
-        cwd=versions[k]['dir'],
-    )
+    try:
+        subprocess.check_call(
+            GIT_FETCH_TAGS.split(),
+            cwd=versions[k]['dir'],
+        )
+    except subprocess.CalledProcessError as e:
+        print(e)
+        raise
 
     v_str = subprocess.check_output(
         GIT_DESCRIBE_CMD.split(),
diff --git a/open_pdks/run.sh b/open_pdks/run.sh
index fa54dec..2d5b03a 100755
--- a/open_pdks/run.sh
+++ b/open_pdks/run.sh
@@ -25,6 +25,8 @@
 
 TOP_DIR=$PWD
 
+set -e
+
 echo
 echo "              Current directory: $PWD"
 echo "                         Script: $SCRIPT_SRC"