diff --git a/gluon/__init__.py b/gluon/__init__.py
index 9c62c6bc..8d7b9955 100644
--- a/gluon/__init__.py
+++ b/gluon/__init__.py
@@ -23,7 +23,6 @@ try:
     import pydal
     sys.modules['pydal'] = pydal
 except ImportError:
-    raise
     raise RuntimeError(
         "web2py depends on pydal, which apparently you have not installed.\n" +
         "Probably you cloned the repository using git without '--recursive'" +
@@ -32,6 +31,7 @@ except ImportError:
         "You can also download a complete copy from http://www.web2py.com."
     )
 
+
 from .globals import current
 from .html import *
 from .validators import *
diff --git a/gluon/packages/template/template.py b/gluon/packages/template/template.py
index 0f8c4a1b..3a41ea70 100644
--- a/gluon/packages/template/template.py
+++ b/gluon/packages/template/template.py
@@ -1006,4 +1006,3 @@ if __name__ == '__main__':
     def test():
         return dict(a=3)
     assert test() == '<div>0</div><div>1</div><div>2</div>'
-    print 'ok'