diff --git a/ipload.c b/ipload.c
index 4ce9369..5d8ad7e 100644
--- a/ipload.c
+++ b/ipload.c
@@ -134,21 +134,22 @@ main (int argc, char *argv[])
 	}
 
 	/* then, load the internal client */
-	intclient = jack_internal_client_load (client, intclient_name,
-					       (JackLoadName|JackLoadInit),
-					       &status, load_name, load_init);
-	if (status & JackFailure) {
-		fprintf (stderr, "could not load %s, status = 0x%2.0x\n",
-			 load_name, status);
-		return 2;
-	}
-	if (status & JackNameNotUnique) {
-		intclient_name =
-			jack_get_internal_client_name (client, intclient);
-		fprintf (stderr, "unique internal client name `%s' assigned\n",
-			 intclient_name);
-	}
-
+	jack_internal_client_load (client, intclient_name,
+                                   (JackLoadName|JackLoadInit),
+                                   &status, intclient, load_name, load_init);
+
+        if (status & JackFailure) {
+                fprintf (stderr, "could not load %s, status = 0x%2.0x\n",
+                         load_name, status);
+                return 2;
+        }
+        
+        if (status & JackNameNotUnique) {
+                intclient_name = jack_get_internal_client_name (client, intclient);
+                fprintf (stderr, "unique internal client name `%s' assigned\n",
+                         intclient_name);
+        }
+        
 	fprintf (stdout, "%s is running.\n", load_name);
 
 	if (wait_opt) {
diff --git a/ipunload.c b/ipunload.c
index a49418c..395904b 100644
--- a/ipunload.c
+++ b/ipunload.c
@@ -49,9 +49,11 @@ main (int argc, char *argv[])
 
 	/* then, get the internal client handle */
 	client_name = argv[1];
-	intclient = jack_internal_client_handle (client, client_name, &status);
-	if (status & JackFailure) {
-		fprintf (stderr, "client %s not found.\n", client_name);
+
+	if (jack_internal_client_handle (client, client_name, &status, intclient) != 0) {
+                if (status & JackFailure) {
+                        fprintf (stderr, "client %s not found.\n", client_name);
+                }
 		exit (2);
 	}