diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index 69823553..101a508e 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -102,7 +102,6 @@ static jack_client_t* jack_client_open_aux(const char* client_name, jack_options
         *status = (jack_status_t)0;
         return (jack_client_t*)client;
     }
-    return NULL;
 }
 
 EXPORT jack_client_t* jack_client_new(const char* client_name)
@@ -130,12 +129,13 @@ EXPORT int jack_client_close(jack_client_t* ext_client)
     if (client == NULL) {
         jack_error("jack_client_close called with a NULL client");
         return -1;
-    }
-    int res = client->Close();
-    delete client;
-    JackLog("jack_client_close OK\n");
-    JackLibGlobals::Destroy(); // jack library destruction
-    return res;
+    } else {
+		int res = client->Close();
+		delete client;
+		JackLog("jack_client_close OK\n");
+		JackLibGlobals::Destroy(); // jack library destruction
+		return res;
+	}
 }
 
 
diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp
index ac833bb6..e8931b0c 100644
--- a/common/JackServerAPI.cpp
+++ b/common/JackServerAPI.cpp
@@ -17,10 +17,10 @@ This program is free software; you can redistribute it and/or modify
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
-#ifdef WIN32 
-#pragma warning (disable : 4786)
-#endif
+
+#ifdef WIN32 
+#pragma warning (disable : 4786)
+#endif
 
 #include "JackInternalClient.h"
 #include "JackGraphManager.h"
@@ -95,9 +95,7 @@ EXPORT void my_jack_internal_client_close(jack_client_t* ext_client)
     if (client == NULL) {
         jack_error("jack_internal_client_close called with a NULL client");
     } else {
-        int res = client->Deactivate();
-        JackLog("jack_internal_client_close Deactivate %ld", res);
-        res = client->Close();
+		client->Close();
         delete client;
         JackLog("jack_internal_client_close OK");
     }