diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 307cc3489c3c..f94059673ed0 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2051,13 +2051,12 @@ static SSL_SESSION *php_openssl_session_get_cb(SSL *ssl, const unsigned char *se
 				SSL_SESSION_up_ref(obj->session);
 				session = obj->session;
 			}
-			zval_ptr_dtor(&retval);
 		} else if (Z_TYPE(retval) != IS_NULL) {
 			zend_type_error("session_get_cb return type must be null or OpenSSLSession");
-			return NULL;
 		}
 	}
 
+	zval_ptr_dtor(&retval);
 	zval_ptr_dtor(&args[1]);
 
 	*copy = 0;
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 7ded14366a9f..006adc4467d3 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -914,7 +914,7 @@ PHP_FUNCTION(explode)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ZSTR_LEN(delim) == 0) {
-		zend_argument_must_not_be_empty_error(1);
+		zend_argument_value_error(1, "must not be empty, use str_split() to split a string into characters");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt
index ea467a2d5504..248fade7605c 100644
--- a/ext/standard/tests/strings/explode.phpt
+++ b/ext/standard/tests/strings/explode.phpt
@@ -62,9 +62,9 @@ array (
   4 => 'd',
 )
 d6bee42a771449205344c0938ad4f035
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
 array(1) {
   [0]=>
   string(0) ""
@@ -79,7 +79,7 @@ array(1) {
   [0]=>
   string(0) ""
 }
-explode(): Argument #1 ($separator) must not be empty
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
 array(1) {
   [0]=>
   string(3) "acb"
diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt
index 876b159821cd..022654a57643 100644
--- a/ext/standard/tests/strings/explode1.phpt
+++ b/ext/standard/tests/strings/explode1.phpt
@@ -91,15 +91,15 @@ var_dump( explode("b", $obj) );
 --EXPECT--
 *** Testing explode() for basic operations ***
 -- Iteration 1 --
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
 -- Iteration 2 --
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
 -- Iteration 3 --
 array(1) {
   [0]=>
@@ -201,10 +201,10 @@ array(2) {
   string(56) "234NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 7 --
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
-explode(): Argument #1 ($separator) must not be empty
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
+explode(): Argument #1 ($separator) must not be empty, use str_split() to split a string into characters
 -- Iteration 8 --
 array(2) {
   [0]=>