diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c
index 98c19f05a..c33a57322 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c
@@ -459,11 +459,18 @@ ecma_builtin_promise_do_all (ecma_value_t array, /**< the array for all */
     /* e. h. */
     ecma_string_t *index_to_str_p = ecma_new_ecma_string_from_uint32 (index);
     ecma_value_t array_item = ecma_op_object_get (array_p, index_to_str_p);
-    ecma_op_object_put (ecma_get_object_from_value (value_array),
-                        index_to_str_p,
-                        undefined_val,
-                        false);
+    ecma_value_t put_ret = ecma_op_object_put (ecma_get_object_from_value (value_array),
+                                               index_to_str_p,
+                                               undefined_val,
+                                               false);
     ecma_deref_ecma_string (index_to_str_p);
+
+    if (ECMA_IS_VALUE_ERROR (put_ret))
+    {
+      ret = put_ret;
+      break;
+    }
+
     /* i. */
     ecma_value_t next_promise = ecma_builtin_promise_resolve (ctor, array_item);
     ecma_free_value (array_item);
diff --git a/tests/jerry/es2015/regression-test-issue-2487.js b/tests/jerry/es2015/regression-test-issue-2487.js
new file mode 100644
index 000000000..54ea8547b
--- /dev/null
+++ b/tests/jerry/es2015/regression-test-issue-2487.js
@@ -0,0 +1,16 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+Object.defineProperty(Array.prototype, 0, {set: function() {var $ = $()}});
+Promise.all([0]);
diff --git a/tests/jerry/es2015/regression-test-issue-2488.js b/tests/jerry/es2015/regression-test-issue-2488.js
new file mode 100644
index 000000000..605d5bf26
--- /dev/null
+++ b/tests/jerry/es2015/regression-test-issue-2488.js
@@ -0,0 +1,16 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+Object.defineProperty(Array.prototype, 0, {set: function() {throw "MyError"}});
+Promise.all([0]);