--- ../original/src/lib-http/test-http-auth.c	2014-09-24 20:34:27.000000000 +0100
+++ src/lib-http/test-http-auth.c	2015-01-10 15:22:59.083365723 +0000
@@ -120,7 +120,7 @@
 							strcmp(chalo->scheme, chalt->scheme) == 0);
 					if (chalo->data == NULL || chalt->data == NULL) {
 						test_out(t_strdup_printf("[%d]->data = %s",
-							index, str_sanitize(chalo->data, 80)),
+							index, str_sanitize(chalo->data == NULL ? "NULL" : chalo->data, 80)),
 							chalo->data == chalt->data);
 					} else {
 						test_out(t_strdup_printf("[%d]->data = %s",
@@ -230,7 +230,7 @@
 					strcmp(out.scheme, test->scheme) == 0);
 			if (out.data == NULL || test->data == NULL) {
 				test_out(t_strdup_printf("->data = %s",
-					str_sanitize(out.data, 80)),
+					str_sanitize(out.data == NULL ? "NULL" : out.data, 80)),
 					out.data == test->data);
 			} else {
 				test_out(t_strdup_printf("->data = %s",
--- ../original/src/lib-http/test-http-request-parser.c	2014-06-02 12:50:10.000000000 +0100
+++ src/lib-http/test-http-request-parser.c	2015-01-10 15:25:52.198118307 +0000
@@ -269,7 +269,7 @@
 		
 			if (payload == NULL || test->payload == NULL) {
 				test_out(t_strdup_printf("request->payload = %s",
-					str_sanitize(payload, 80)),
+					str_sanitize(payload == NULL ? "NULL" : payload, 80)),
 					payload == test->payload);
 			} else {
 				test_out(t_strdup_printf("request->payload = %s",
--- ../original/src/lib-imap/test-imap-url.c	2014-07-03 10:44:49.000000000 +0100
+++ src/lib-imap/test-imap-url.c	2015-01-10 15:57:26.923109229 +0000
@@ -637,14 +637,14 @@
 					       strcmp(urlp->host_name, urlt->host_name) == 0);
 			}
 			if (urlp->userid == NULL || urlt->userid == NULL) {
-				test_out_quiet(t_strdup_printf("url->userid = %s", urlp->userid),
+				test_out_quiet(t_strdup_printf("url->userid = %s", urlp->userid == NULL ? "NULL" : urlp->userid),
 					       urlp->userid == urlt->userid);
 			} else {
 				test_out_quiet(t_strdup_printf("url->userid = %s", urlp->userid),
 					       strcmp(urlp->userid, urlt->userid) == 0);
 			}
 			if (urlp->auth_type == NULL || urlt->auth_type == NULL) {
-				test_out_quiet(t_strdup_printf("url->auth_type = %s", urlp->auth_type),
+				test_out_quiet(t_strdup_printf("url->auth_type = %s", urlp->auth_type == NULL ? "NULL" : urlp->auth_type),
 					       urlp->auth_type == urlt->auth_type);
 			} else {
 				test_out_quiet(t_strdup_printf("url->auth_type = %s", urlp->auth_type),
@@ -665,7 +665,7 @@
 					       urlp->have_host_ip == urlt->have_host_ip);
 			}
 			if (urlp->mailbox == NULL || urlt->mailbox == NULL) {
-				test_out_quiet(t_strdup_printf("url->mailbox = %s", urlp->mailbox),
+				test_out_quiet(t_strdup_printf("url->mailbox = %s", urlp->mailbox == NULL ? "NULL" : urlp->mailbox),
 					       urlp->mailbox == urlt->mailbox);
 			} else {
 				test_out_quiet(t_strdup_printf("url->mailbox = %s", urlp->mailbox),
@@ -676,7 +676,7 @@
 			test_out_quiet(t_strdup_printf("url->uid = %u", urlp->uid),
 				       urlp->uid == urlt->uid);
 			if (urlp->section == NULL || urlt->section == NULL) {
-				test_out_quiet(t_strdup_printf("url->section = %s", urlp->section),
+				test_out_quiet(t_strdup_printf("url->section = %s", urlp->section == NULL ? "NULL" : urlp->section),
 					       urlp->section == urlt->section);
 			} else {
 				test_out_quiet(t_strdup_printf("url->section = %s", urlp->section),
@@ -688,7 +688,7 @@
 				       urlp->partial_size == urlt->partial_size);
 			if (urlp->search_program == NULL || urlt->search_program == NULL) {
 				test_out_quiet(t_strdup_printf(
-						       "url->search_program = %s", urlp->search_program),
+						       "url->search_program = %s", urlp->search_program == NULL ? "NULL" : urlp->search_program),
 					       urlp->search_program == urlt->search_program);
 			} else {
 				test_out_quiet(t_strdup_printf(
@@ -718,7 +718,7 @@
 				if (urlp->uauth_access_user == NULL ||
 				    urlt->uauth_access_user == NULL) {
 					test_out_quiet(t_strdup_printf("url->uauth_access_user = %s",
-								       urlp->uauth_access_user),
+								       urlp->uauth_access_user == NULL ? "NULL" : urlp->uauth_access_user),
 						       urlp->uauth_access_user == urlt->uauth_access_user);
 				} else {
 					test_out_quiet(t_strdup_printf("url->uauth_access_user = %s",
@@ -728,7 +728,7 @@
 				}
 				if (urlp->uauth_mechanism == NULL || urlt->uauth_mechanism == NULL) {
 					test_out_quiet(t_strdup_printf(
-							       "url->uauth_mechanism = %s", urlp->uauth_mechanism),
+							       "url->uauth_mechanism = %s", urlp->uauth_mechanism == NULL ? "NULL" : urlp->uauth_mechanism),
 						       urlp->uauth_mechanism == urlt->uauth_mechanism);
 				} else {
 					test_out_quiet(t_strdup_printf(
@@ -737,7 +737,7 @@
 				}
 				if (urlp->uauth_token == NULL || urlt->uauth_token == NULL) {
 					test_out_quiet(t_strdup_printf(
-							       "url->uauth_token = %s", urlp->uauth_token),
+							       "url->uauth_token = %s", urlp->uauth_token == NULL ? (unsigned char *) "NULL" : urlp->uauth_token),
 						       urlp->uauth_token == urlt->uauth_token);
 				} else {
 					bool equal = urlp->uauth_token_size == urlt->uauth_token_size;