diff --git a/ChangeLog b/ChangeLog
index 78c9eeec..cdf29544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@ Fernando Lopez-Lezcano
   Jackdmp changes log
 ---------------------------
 
+2008-05-01 Stephane Letz  <letz@grame.fr>
+
+	* Fix JackMachClientChannel::InternalClientLoad.
+
 2008-04-30 Stephane Letz  <letz@grame.fr>
 		
 	* Fix JackRestartThreadedDriver::Execute.
diff --git a/macosx/JackMachClientChannel.cpp b/macosx/JackMachClientChannel.cpp
index 6a6da47a..365a9494 100644
--- a/macosx/JackMachClientChannel.cpp
+++ b/macosx/JackMachClientChannel.cpp
@@ -279,7 +279,11 @@ void JackMachClientChannel::InternalClientHandle(int refnum, const char* client_
 
 void JackMachClientChannel::InternalClientLoad(int refnum, const char* client_name, const char* so_name, const char* objet_data, int options, int* status, int* int_ref, int* result)
 {
-    kern_return_t res = rpc_jack_internal_clientload(fPrivatePort, refnum, (char*)client_name, (char*)so_name, (char*)objet_data, options, status, int_ref, result);
+    const char* int_client_name = (client_name) ? client_name : "";
+    const char* int_so_name = (so_name) ? so_name : "";
+    const char* int_objet_data = (objet_data) ? objet_data : "";
+    
+    kern_return_t res = rpc_jack_internal_clientload(fPrivatePort, refnum, (char*)int_client_name, (char*)int_so_name, (char*)int_objet_data, options, status, int_ref, result);
     if (res != KERN_SUCCESS) {
         *result = -1;
         jack_error("JackMachClientChannel::InternalClientLoad err = %s", mach_error_string(res));