diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index a35cff62..1ce15e59 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -324,7 +324,6 @@ int JackServer::SwitchMaster(jack_driver_desc_t* driver_desc, JSList* driver_par
 
     if (master == NULL || info == NULL) {
         delete info;
-        delete master;
         return -1;
     } else {
 
diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp
index 27943ca3..00127fa6 100644
--- a/common/JackServerGlobals.cpp
+++ b/common/JackServerGlobals.cpp
@@ -395,7 +395,6 @@ error:
     jack_log("JackServerGlobals Init error");
     if (master_driver_params)
         jack_free_driver_params(master_driver_params);
-    //fUserCount--;
     Destroy();
     return false;
 }