diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy
index 0fad8397d..ccb97e3a3 100755
--- a/bin/nova-vncproxy
+++ b/bin/nova-vncproxy
@@ -71,8 +71,6 @@ if __name__ == "__main__":
     LOG.audit(_("Starting nova-vnc-proxy node (version %s)"),
               version.version_string_with_vcs())
 
-    service.serve()
-
     if not (os.path.exists(FLAGS.vncproxy_wwwroot) and
             os.path.exists(FLAGS.vncproxy_wwwroot + '/vnc_auto.html')):
         LOG.info(_("Missing vncproxy_wwwroot (version %s)"),
@@ -96,6 +94,8 @@ if __name__ == "__main__":
     else:
         with_auth = auth.VNCNovaAuthMiddleware(with_logging)
 
+    service.serve()
+
     server = wsgi.Server()
     server.start(with_auth, FLAGS.vncproxy_port, host=FLAGS.vncproxy_host)
     server.wait()
diff --git a/doc/source/runnova/vncconsole.rst b/doc/source/runnova/vncconsole.rst
index 6d93bad93..942ace611 100644
--- a/doc/source/runnova/vncconsole.rst
+++ b/doc/source/runnova/vncconsole.rst
@@ -36,7 +36,7 @@ Configuring the VNC Proxy
 -------------------------
 nova-vnc-proxy requires a websocket enabled html client to work properly.  At 
 this time, the only tested client is a slightly modified fork of noVNC, which 
-you can at find git://github.com/sleepsonthefloor/noVNC.git.
+you can at find http://github.com/openstack/noVNC.git
 
 .. todo:: add instruction for installing from package