diff --git a/blocks/edit_form.php b/blocks/edit_form.php
index 5dfec207253ef..61bdc5a27325c 100644
--- a/blocks/edit_form.php
+++ b/blocks/edit_form.php
@@ -441,6 +441,11 @@ public function process_dynamic_submission() {
             $blockregion = $this->optional_param('blockregion', null, PARAM_TEXT);
             $newblock = $this->page->blocks->add_block_at_end_of_default_region($this->block->name(),
                 empty($blockregion) ? null : $blockregion);
+
+            if (empty($newblock)) {
+                return;
+            }
+
             $this->page->blocks->load_blocks();
             $newblock = $this->page->blocks->find_instance($newblock->instance->id);
             $newdata = $this->prepare_defaults($newblock->instance);