diff --git a/main/views.py b/main/views.py
index 71402fc..153dd9f 100644
--- a/main/views.py
+++ b/main/views.py
@@ -160,7 +160,6 @@ def updatesite(request, pk):
                 else:
                     if name != site.name:
                         rmwsgi(request, site.name)
-                        mkwsgi(request, name, site.dirname)
                         site.name = name
                         site.save()
                     if form.cleaned_data['zip_file']:
@@ -172,6 +171,7 @@ def updatesite(request, pk):
                             move(d,site.dirname)
                             site.save()
                     if 'error' not in rc:
+                        mkwsgi(request,site.name, site.dirname)
                         return redirect(reverse('main.views.admin'))
     rc['form'] = form
     return render(request, 'main/updatesite.html', rc)
diff --git a/templates/wsgi/template.py b/templates/wsgi/template.py
index 7957304..4ead8f7 100644
--- a/templates/wsgi/template.py
+++ b/templates/wsgi/template.py
@@ -11,7 +11,14 @@
 
 #what are we going to do to secure the server?
 
-from app import app as application
+
+def application(environ, start_response):
+    try:
+        from app import app as student_app
+    except:
+        raise ImportError("Could not find the application entry point. Please make sure that your app.py file has the line: 'app = Flask(__name__)'")
+    return student_app(environ, start_response)
+
 
 from paste.exceptions.errormiddleware import ErrorMiddleware
 application = ErrorMiddleware(application, debug=True)