diff --git a/aksetup_helper.py b/aksetup_helper.py
index 3e8cbed25b78ad0ec8823b67f27f162799daa038..487ecaa98deda5eacd65f559e15330d33e8c33f0 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -257,7 +257,7 @@ def expand_value(v, options):
 
 def expand_options(options):
     return dict(
-            (k, expand_value(v, options)) for k, v in options.iteritems())
+            (k, expand_value(v, options)) for k, v in options.items())
 
 
 
@@ -726,8 +726,8 @@ def check_git_submodules():
         stdout_data, _ = popen.communicate()
         if popen.returncode != 0:
             git_error = "git returned error code %d" % popen.returncode
-    except OSError, e:
-        git_error = e
+    except OSError:
+        git_error = "(os error, likely git not found)"
 
     if git_error is not None:
         print("-------------------------------------------------------------------------")