diff --git a/apps/xmlrpc2di/XMLRPC2DI.h b/apps/xmlrpc2di/XMLRPC2DI.h
index 222ce91a..497c20e2 100644
--- a/apps/xmlrpc2di/XMLRPC2DI.h
+++ b/apps/xmlrpc2di/XMLRPC2DI.h
@@ -136,12 +136,12 @@ class XMLRPC2DIServer
   ~XMLRPC2DIServer() {
     stop();
     join();
-    if (s) {
-      delete s;
-    }
     if (di_method) {
       delete di_method;
     }
+    if (s) {
+      delete s;
+    }
   }
 
   bool initialize();