--- a/smf/smfservermodule/smfserver/main.cpp	Fri May 21 16:50:44 2010 +0100
+++ b/smf/smfservermodule/smfserver/main.cpp	Mon Jun 07 11:43:45 2010 +0100
@@ -35,9 +35,14 @@
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
-    
-	SmfServer* server = new SmfServer();
-	server->startServer();
-	
-    return a.exec();
+    SmfServer* server = new SmfServer(&a);
+    int status = -1;
+
+    if (server)
+    {
+        server->startServer();
+        status = a.exec();
+    }
+
+    return status;
 }