diff --git a/CI/activate_msvc.sh b/CI/activate_msvc.sh
index 05925737a..47f2c246f 100644
--- a/CI/activate_msvc.sh
+++ b/CI/activate_msvc.sh
@@ -1,13 +1,24 @@
 #!/bin/bash
 
+oldSettings=$-
 set -eu
 
+function restoreOldSettings {
+    if [[ $oldSettings != *e* ]]; then
+        set +e
+    fi
+    if [[ $oldSettings != *u* ]]; then
+        set +u
+    fi
+}
+
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     echo "Error: Script not sourced."
     echo "You must source this script for it to work, i.e. "
     echo "source ./activate_msvc.sh"
     echo "or"
     echo ". ./activate_msvc.sh"
+    restoreOldSettings
     exit 1
 fi
 
@@ -78,7 +89,10 @@ command -v mt >/dev/null 2>&1 || { echo "Error: mt (MS Windows Manifest Tool) mi
 
 if [ $MISSINGTOOLS -ne 0 ]; then
     echo "Some build tools were unavailable after activating MSVC in the shell. It's likely that your Visual Studio $MSVC_DISPLAY_YEAR installation needs repairing."
+    restoreOldSettings
     return 1
 fi
 
-IFS="$originalIFS"
\ No newline at end of file
+IFS="$originalIFS"
+
+restoreOldSettings
\ No newline at end of file