diff --git a/test/Bindings/Go/lit.local.cfg b/test/Bindings/Go/lit.local.cfg
index 8158dd49e7f..c41ff16b287 100644
--- a/test/Bindings/Go/lit.local.cfg
+++ b/test/Bindings/Go/lit.local.cfg
@@ -36,13 +36,13 @@ def fixup_compiler_path(compiler):
     try:
         if path.endswith('/cc') and os.readlink(path) == 'clang':
             args[0] = path[:len(path)-2] + 'clang'
-    except AttributeError:
+    except (AttributeError, OSError):
         pass
 
     try:
         if path.endswith('/c++') and os.readlink(path) == 'clang++':
             args[0] = path[:len(path)-3] + 'clang++'
-    except AttributeError:
+    except (AttributeError, OSError):
         pass
 
     return ' '.join([pipes.quote(arg) for arg in args])