diff --git a/src/general.c b/src/general.c
index 280df08d..81e02e6c 100644
--- a/src/general.c
+++ b/src/general.c
@@ -554,10 +554,10 @@ getdns_general_ns(getdns_context *context, getdns_eventloop *loop,
 	size_t i;
 	uint64_t now_ms = 0;
 
-	if (!context || !name || (!callbackfn && !internal_cb))
+	if (!context || (!name && !extensions) || (!callbackfn && !internal_cb))
 		return GETDNS_RETURN_INVALID_PARAMETER;
 	
-	if ((r = _getdns_validate_dname(name)))
+	if (name && (r = _getdns_validate_dname(name)))
 		return r;
 
 	if (extensions && (r = validate_extensions(extensions)))
@@ -685,7 +685,10 @@ _getdns_address_loop(getdns_context *context, getdns_eventloop *loop,
 	uint32_t value;
 	getdns_network_req *netreq = NULL;
 
-	if (!my_extensions) {
+	if (!name)
+		return GETDNS_RETURN_INVALID_PARAMETER;
+
+	else if (!my_extensions) {
 		if (!(my_extensions=getdns_dict_create_with_context(context)))
 			return GETDNS_RETURN_MEMORY_ERROR;
 	} else if (
@@ -806,6 +809,10 @@ _getdns_service_loop(getdns_context *context, getdns_eventloop *loop,
 {
 	getdns_return_t r;
 	getdns_network_req *netreq = NULL;
+
+	if (!name)
+		return GETDNS_RETURN_INVALID_PARAMETER;
+
 	r = getdns_general_ns(context, loop, name, GETDNS_RRTYPE_SRV,
 	    extensions, userarg, &netreq, callback, NULL, 1);
 	if (netreq && transaction_id)
diff --git a/src/request-internal.c b/src/request-internal.c
index 15f97179..3bf4bb26 100644
--- a/src/request-internal.c
+++ b/src/request-internal.c
@@ -740,6 +740,7 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
 	 */
 	size_t max_query_sz, max_response_sz, netreq_sz, dnsreq_base_sz;
 	uint8_t *region, *suffixes;
+	getdns_bindata *qname = NULL;
 	
 	if (extensions == dnssec_ok_checking_disabled ||
 	    extensions == dnssec_ok_checking_disabled_roadblock_avoidance ||
@@ -862,7 +863,34 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
 	memcpy(suffixes, context->suffixes, context->suffixes_len);
 
 	result->append_name = context->append_name;
-	if (!strlen(name) || name[strlen(name)-1] == '.' ||
+	result->name_len = sizeof(result->name);
+	if (name) {
+		if (gldns_str2wire_dname_buf(
+		    name, result->name, &result->name_len)) {
+			GETDNS_FREE(result->my_mf, result);
+			return NULL;
+		}
+	} else if (!extensions || (
+	    getdns_dict_get_bindata(extensions, "/question/qname", &qname) &&
+	    getdns_dict_get_bindata(
+	    extensions, "/replies_tree/0/question/qname", &qname)) ||
+	    qname->size > sizeof(result->name)) {
+
+		GETDNS_FREE(result->my_mf, result);
+		return NULL;
+
+	} else {
+		uint32_t qtype = request_type;
+
+		result->name_len = qname->size;
+		(void) memcpy(result->name, qname->data, qname->size);
+		if (!getdns_dict_get_int(
+		    extensions, "/question/qtype", &qtype) ||
+		    !getdns_dict_get_int(
+		    extensions, "/replies_tree/0/question/qtype", &qtype))
+			request_type = qtype;
+	}
+	if (!name || !strlen(name) || name[strlen(name)-1] == '.' ||
 	    result->append_name == GETDNS_APPEND_NAME_NEVER) {
 		/* Absolute query string, no appending */
 		result->suffix_len = no_suffixes[0];
@@ -873,11 +901,6 @@ _getdns_dns_req_new(getdns_context *context, getdns_eventloop *loop,
 		result->suffix = suffixes + 1;
 		result->suffix_appended = 0;
 	}
-	result->name_len = sizeof(result->name);
-	if (gldns_str2wire_dname_buf(name, result->name, &result->name_len)) {
-		GETDNS_FREE(result->my_mf, result);
-		return NULL;
-	}
 	if (result->append_name == GETDNS_APPEND_NAME_ALWAYS ||
 	    (  result->append_name == GETDNS_APPEND_NAME_TO_SINGLE_LABEL_FIRST
 	    && result->name[0] && result->name[result->name[0]+1] == 0)){