diff --git a/ChangeLog b/ChangeLog
index 537f30bd..145c514d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,7 @@ Paul Davis
   Jackdmp changes log
 ---------------------------
 
-2009-04-21 Stephane Letz  <letz@grame.fr>
+2009-04-22 Stephane Letz  <letz@grame.fr>
 
 	* jackctl_server_load_master renamed to jackctl_server_switch_master, jackctl_server_unload_master is removed.
 
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 7ba2cd80..15386d99 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -346,7 +346,9 @@ int JackServer::SwitchMaster(jack_driver_desc_t* driver_desc, JSList* driver_par
     JackDriverInfo* info = new JackDriverInfo();
     JackDriverClientInterface* master = info->Open(driver_desc, fEngine, GetSynchroTable(), driver_params);
     
-    if (master == NULL) {
+    if (master == NULL || info == NULL) {
+        delete info;
+        delete master;
         return -1;
     } else {