Index: client/client.c
===================================================================
--- client/client.c	(revision 24697)
+++ client/client.c	(working copy)
@@ -2841,7 +2841,8 @@
 
 cleanup:
 	for (i = 0; i < info.count; i++)
-		free(info.matches[i]);
+		if (info.matches[i])
+			free(info.matches[i]);
 	free(info.matches);
 	return NULL;
 }
@@ -2923,7 +2924,8 @@
 
 cleanup:
 		while (i >= 0) {
-			free(matches[i]);
+			if(matches[i])
+				free(matches[i]);
 			i--;
 		}
 		free(matches);