diff --git a/DOMTEST b/DOMTEST
index 2c122cb..d93f72a 100644
--- a/DOMTEST
+++ b/DOMTEST
@@ -786,8 +786,6 @@ implementationAttribute expandEntityReferences not supported, skipping test
 753/808 nodeissupported04.xml
 754/808 nodeissupported05.xml
 755/808 nodenormalize01.xml
-TEST FAILED: NOT_SUPPORTED_ERR (9):
-No entity resolver registered.
 756/808 nodesetprefix01.xml
 757/808 nodesetprefix02.xml
 758/808 nodesetprefix03.xml
@@ -839,4 +837,4 @@ implementationAttribute expandEntityReferences not supported, skipping test
 803/808 setNamedItemNS04.xml
 804/808 setNamedItemNS05.xml
 805/808 systemId01.xml
-1/763 tests failed; 45 tests were skipped
\ No newline at end of file
+0/763 tests failed; 45 tests were skipped
\ No newline at end of file
diff --git a/dom/dom-impl.lisp b/dom/dom-impl.lisp
index ed28987..977be7e 100644
--- a/dom/dom-impl.lisp
+++ b/dom/dom-impl.lisp
@@ -1193,11 +1193,10 @@
   (let* ((owner (dom:owner-document instance))
          (handler (dom:make-dom-builder))
          (resolver (slot-value owner 'entity-resolver)))
-    (unless resolver
-      (dom-error :NOT_SUPPORTED_ERR "No entity resolver registered."))
-    (setf (document handler) owner)
-    (push instance (element-stack handler))
-    (funcall resolver (dom:name instance) handler))
+    (when resolver
+      (setf (document handler) owner)
+      (push instance (element-stack handler))
+      (funcall resolver (dom:name instance) handler)))
   (labels ((walk (n)
              (setf (slot-value n 'read-only-p) t)
              (when (dom:element-p n)