diff --git a/core/modules/contextual/js/contextual.js b/core/modules/contextual/js/contextual.js
index bc1debf..cd3007c 100644
--- a/core/modules/contextual/js/contextual.js
+++ b/core/modules/contextual/js/contextual.js
@@ -108,7 +108,7 @@
       .find('.contextual');
 
     // Early-return when there's no nesting.
-    if ($contextuals.length === 1) {
+    if ($contextuals.length <= 1) {
       return;
     }
 
diff --git a/core/modules/quickedit/js/quickedit.js b/core/modules/quickedit/js/quickedit.js
index 4da668e..a52c7a0 100644
--- a/core/modules/quickedit/js/quickedit.js
+++ b/core/modules/quickedit/js/quickedit.js
@@ -349,6 +349,12 @@
     if (entityElement.length === 0) {
       entityElement = $('.region-content').find(entityElementSelector);
     }
+
+    // Prevent errors if the necessary entity markup is missing.
+    if (entityElement.length === 0) {
+      return;
+    }
+
     var entityInstanceID = entityElement
       .get(0)
       .getAttribute('data-quickedit-entity-instance-id');