diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 41981fd0..c16bb0ea 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -94,7 +94,7 @@
         {{block center}}
         {{include}}
         {{end}}
-        {{=response.toolbar() if configuration.get('app.toolbar') else ''}}
+        {{=response.toolbar() if 'configuration' in globals() and configuration.get('app.toolbar') else ''}}
       </div>
     </div>
 
diff --git a/gluon/compileapp.py b/gluon/compileapp.py
index 1e0d3ef0..0d61afb3 100644
--- a/gluon/compileapp.py
+++ b/gluon/compileapp.py
@@ -724,7 +724,7 @@ def run_view_in(environment):
                                    context=environment)
             # Compile template
             ccode = compile2(scode, filename)
-            layer = filename
+            layer = filename        
     restricted(ccode, environment, layer=layer, scode=scode)
     # parse_template saves everything in response body
     return environment['response'].body.getvalue()