diff --git a/aksetup_helper.py b/aksetup_helper.py
index 508c57093f8d8ce496b9db9dcaf8ae72c2cb7ea8..cafdad6455a99938549c0bfbe41c6241d040f414 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -316,7 +316,8 @@ class ConfigSchema:
         except IOError:
             pass
 
-        del filevars["__builtins__"]
+        if "__builtins__" in filevars:
+            del filevars["__builtins__"]
 
         for key, value in config.items():
             if value is not None:
diff --git a/setup.py b/setup.py
index 1694fd308ed383f4a24dabc4f5e6e157ff29f959..7dc43026a67fbb467b78d096fb6c77f847e7a1f8 100644
--- a/setup.py
+++ b/setup.py
@@ -117,7 +117,7 @@ def main():
         print("Mako is not installed.")
         print("-------------------------------------------------------------------------")
         print("That is not a problem, as most of PyOpenCL will be just fine without it.")
-        print("Some higher-level parts of pyopencl (pyopencl.reduction, to be precise)")
+        print("Some higher-level parts of pyopencl (such as pyopencl.reduction)")
         print("will not function without the templating engine Mako [1] being installed.")
         print("If you would like this functionality to work, you might want to install")
         print("Mako after you finish installing PyOpenCL.")