diff --git a/ext/standard/array.c b/ext/standard/array.c
index 54c08b3c97080..02c0bccc6f07f 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2447,7 +2447,7 @@ PHP_FUNCTION(extract)
 }
 /* }}} */
 
-static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_value, zval *entry) /* {{{ */
+static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_value, zval *entry, uint32_t pos) /* {{{ */
 {
 	zval *value_ptr, data;
 
@@ -2475,11 +2475,14 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu
 			Z_PROTECT_RECURSION_P(entry);
 		}
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(entry), value_ptr) {
-			php_compact_var(eg_active_symbol_table, return_value, value_ptr);
+			php_compact_var(eg_active_symbol_table, return_value, value_ptr, pos);
 		} ZEND_HASH_FOREACH_END();
 	    if (Z_REFCOUNTED_P(entry)) {
 			Z_UNPROTECT_RECURSION_P(entry);
 		}
+	} else {
+		php_error_docref(NULL, E_WARNING, "Argument #%d must be string or array of strings, %s given", pos, zend_zval_type_name(entry));
+		return;
 	}
 }
 /* }}} */
@@ -2512,7 +2515,7 @@ PHP_FUNCTION(compact)
 	}
 
 	for (i = 0; i < num_args; i++) {
-		php_compact_var(symbol_table, return_value, &args[i]);
+		php_compact_var(symbol_table, return_value, &args[i], i + 1);
 	}
 }
 /* }}} */
diff --git a/ext/standard/tests/array/compact.phpt b/ext/standard/tests/array/compact.phpt
index 978120e822cea..d4c6236c03e47 100644
--- a/ext/standard/tests/array/compact.phpt
+++ b/ext/standard/tests/array/compact.phpt
@@ -11,6 +11,13 @@ $location_vars = array("c\\u0327ity", "state");
 
 $result = compact("event", $location_vars);
 var_dump($result);
+
+$result = compact(true);
+$foo = 'bar';
+$bar = 'baz';
+$result = compact($foo, [42]);
+var_dump($result);
+
 ?>
 --EXPECTF--
 Warning: compact(): Undefined variable $c\u0327ity in %s on line %d
@@ -20,3 +27,11 @@ array(2) {
   ["state"]=>
   string(2) "CA"
 }
+
+Warning: compact(): Argument #1 must be string or array of strings, bool given in %s on line %d
+
+Warning: compact(): Argument #2 must be string or array of strings, int given in %s on line %d
+array(1) {
+  ["bar"]=>
+  string(3) "baz"
+}
\ No newline at end of file
diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt
index da8844d38b276..ec9935b56acdc 100644
--- a/ext/standard/tests/array/compact_basic.phpt
+++ b/ext/standard/tests/array/compact_basic.phpt
@@ -19,12 +19,8 @@ $f="string";
 var_dump (compact(array("a", "b", "c", "d", "e", "f")));
 // simple parameter test
 var_dump (compact("a", "b", "c", "d", "e", "f"));
-var_dump (compact(array("keyval"=>"a", "b"=>"b", "c"=>1)));
-
-// cases which should not yield any output.
-var_dump (compact(array(10, 0.3, true, array(20), NULL)));
-var_dump (compact(10, 0.3, true, array(20), NULL));
-var_dump (compact(array("g")));
+var_dump (compact(array("keyval"=>"a", "b"=>"b")));
+var_dump(compact(array("g")));
 
 echo "Done";
 ?>
@@ -70,10 +66,6 @@ array(2) {
   ["b"]=>
   float(0.2)
 }
-array(0) {
-}
-array(0) {
-}
 
 Warning: compact(): Undefined variable $g in %s on line %d
 array(0) {