diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 5570dec5f8b..d6f01f4a6f8 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2215,11 +2215,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
 
 		ZVAL_STRINGL(&func,"__doRequest",sizeof("__doRequest")-1);
 		ZVAL_STRINGL(&params[0], buf, buf_size);
-		if (location == NULL) {
-			ZVAL_NULL(&params[1]);
-		} else {
-			ZVAL_STRING(&params[1], location);
-		}
+		ZVAL_STRING(&params[1], location);
 		if (action == NULL) {
 			ZVAL_NULL(&params[2]);
 		} else {
@@ -2371,6 +2367,7 @@ static void do_soap_call(zend_execute_data *execute_data,
 
 				if (location == NULL) {
 					location = binding->location;
+					ZEND_ASSERT(location);
 				}
 				if (binding->bindingType == BINDING_SOAP) {
 					sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)fn->bindingAttributes;
diff --git a/ext/soap/soap_arginfo.h b/ext/soap/soap_arginfo.h
index e9bf6fbc8fc..da80ca6fdfe 100644
--- a/ext/soap/soap_arginfo.h
+++ b/ext/soap/soap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: b22d29a51c17d627763229aac15718702002daec */
+ * Stub hash: c0d32b2d8f3c39203b437a01dc79cd4e934dc9f7 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true")
@@ -131,7 +131,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setSoapHeaders, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setLocation, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 0, "\"\"")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()