diff --git a/openerp-server b/openerp-server
index 30d08f2b3da..d2478d00ff6 100755
--- a/openerp-server
+++ b/openerp-server
@@ -266,7 +266,9 @@ if __name__ == "__main__":
         if info['wsgi']:
             openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi']))
 
-    #openerp.wsgi.serve()
+    openerp.osv.osv.start_object_proxy()
+    openerp.service.web_services.start_web_services()
+    openerp.wsgi.serve()
 
 
     setup_pid_file()
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 0a95d1c824b..8d11891640e 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -397,7 +397,7 @@ def dispatch_rpc(service_name, method, params, auth):
     """ Handle a RPC call.
 
     This is pure Python code, the actual marshalling (from/to XML-RPC or
-    NET-RPC) is done in a upper laye.
+    NET-RPC) is done in a upper layer.
     """
     def _log(title, msg, channel=logging.DEBUG_RPC, depth=None, fn=""):
         log(title, msg, channel=channel, depth=depth, fn=fn)
diff --git a/openerp/wsgi.py b/openerp/wsgi.py
index ef3d6d033c6..cdd28e9c8b7 100644
--- a/openerp/wsgi.py
+++ b/openerp/wsgi.py
@@ -40,8 +40,18 @@ import openerp.tools.config as config
 def xmlrpc_return(start_response, service, method, params):
     """ Helper to call a service's method with some params, using a
     wsgi-supplied ``start_response`` callback."""
-    result = openerp.netsvc.ExportService.getService(service).dispatch(method, None, params)
-    response = xmlrpclib.dumps((result,), methodresponse=1, allow_none=False, encoding=None)
+    # This mimics SimpleXMLRPCDispatcher._marshaled_dispatch() for exception
+    # handling.
+    try:
+        result = openerp.netsvc.dispatch_rpc(service, method, params, None) # TODO auth
+        response = xmlrpclib.dumps((result,), methodresponse=1, allow_none=False, encoding=None)
+    except openerp.netsvc.OpenERPDispatcherException, e:
+        fault = xmlrpclib.Fault(openerp.tools.exception_to_unicode(e.exception), e.traceback)
+        response = xmlrpclib.dumps(fault, allow_none=False, encoding=None)
+    except:
+        exc_type, exc_value, exc_tb = sys.exc_info()
+        fault = xmlrpclib.Fault(1, "%s:%s" % (exc_type, exc_value))
+        response = xmlrpclib.dumps(fault, allow_none=None, encoding=None)
     start_response("200 OK", [('Content-Type','text/xml'), ('Content-Length', str(len(response)))])
     return [response]
 
@@ -51,8 +61,6 @@ def wsgi_xmlrpc(environ, start_response):
         length = int(environ['CONTENT_LENGTH'])
         data = environ['wsgi.input'].read(length)
 
-        # TODO see SimpleXMLRPCDispatcher._marshaled_dispatch() for some necessary handling.
-        # TODO see OpenERPDispatcher for some othe handling (in particular, auth things).
         params, method = xmlrpclib.loads(data)
 
         path = environ['PATH_INFO'][len('/openerp/xmlrpc'):]
@@ -87,8 +95,6 @@ def legacy_wsgi_xmlrpc(environ, start_response):
         data = environ['wsgi.input'].read(length)
         path = environ['PATH_INFO'][len('/xmlrpc/'):] # expected to be one of db, object, ...
 
-        # TODO see SimpleXMLRPCDispatcher._marshaled_dispatch() for some necessary handling.
-        # TODO see OpenERPDispatcher for some othe handling (in particular, auth things).
         params, method = xmlrpclib.loads(data)
         return xmlrpc_return(start_response, path, method, params)