diff --git a/src/carddav.c b/src/carddav.c
index aeb0ad5..92e6362 100644
--- a/src/carddav.c
+++ b/src/carddav.c
@@ -425,12 +425,9 @@ CARDDAV_RESPONSE carddav_get_object(response *result,
 	CARDDAV_RESPONSE carddav_response;
 
 	g_return_val_if_fail(info != NULL, TRUE);
+	g_return_val_if_fail(result != NULL, NOTIMPLEMENTED);
 
 	init_runtime(info);
-	if (!result) {
-		result = malloc(sizeof(response *));
-		memset(result, '\0', sizeof(response *));
-	}
 	init_carddav_settings(&settings);
 	settings.ACTION = GET;
 	settings.start = start;
@@ -489,12 +486,9 @@ CARDDAV_RESPONSE carddav_getall_object(response* result,
 	CARDDAV_RESPONSE carddav_response;
 
 	g_return_val_if_fail(info != NULL, TRUE);
+	g_return_val_if_fail(result != NULL, NOTIMPLEMENTED);
 
 	init_runtime(info);
-	if (!result) {
-		result = malloc(sizeof(response *));
-		memset(result, '\0', sizeof(response *));
-	}
 	init_carddav_settings(&settings);
 	settings.ACTION = GETALL;
 	if (info->options->debug)
@@ -553,12 +547,9 @@ CARDDAV_RESPONSE carddav_getall_object_by_uri(response* result,
 	CARDDAV_RESPONSE carddav_response;
 
 	g_return_val_if_fail(info != NULL, TRUE);
+	g_return_val_if_fail(result != NULL, NOTIMPLEMENTED);
 
 	init_runtime(info);
-	if (!result) {
-		result = malloc(sizeof(response *));
-		memset(result, '\0', sizeof(response *));
-	}
 	init_carddav_settings(&settings);
 	settings.ACTION = GETALL;
 	if (info->options->debug)
@@ -616,12 +607,9 @@ CARDDAV_RESPONSE carddav_get_displayname(response* result,
 	CARDDAV_RESPONSE carddav_response;
 
 	g_return_val_if_fail(info != NULL, TRUE);
+	g_return_val_if_fail(result != NULL, NOTIMPLEMENTED);
 
 	init_runtime(info);
-	if (!result) {
-		result = malloc(sizeof(response *));
-		memset(result, '\0', sizeof(response *));
-	}
 	init_carddav_settings(&settings);
 	settings.ACTION = GETCALNAME;
 	if (info->options->debug)