639/808 getElementById01.xml

-TEST FAILED: There is no applicable method for the generic function
-               #<STANDARD-GENERIC-FUNCTION DOM:TAG-NAME (1)>
-             when called with arguments
-               (NIL).

DOMTEST

@@ -670,10 +670,6 @@ implementationAttribute expandEntityReferences not supported, skipping test
 637/808 getAttributeNodeNS01.xml
 638/808 getAttributeNodeNS02.xml
 639/808 getElementById01.xml
-TEST FAILED: There is no applicable method for the generic function
-               #<STANDARD-GENERIC-FUNCTION DOM:TAG-NAME (1)>
-             when called with arguments
-               (NIL).
 640/808 getElementById02.xml
 641/808 getElementsByTagNameNS01.xml
 642/808 getElementsByTagNameNS02.xml
@@ -869,4 +865,4 @@ implementationAttribute expandEntityReferences not supported, skipping test
 803/808 setNamedItemNS04.xml
 804/808 setNamedItemNS05.xml
 805/808 systemId01.xml
-12/763 tests failed; 45 tests were skipped
+11/763 tests failed; 45 tests were skipped

dom/dom-impl.lisp

@@ -425,9 +425,9 @@
   (get-elements-by-tag-name-internal-ns document uri lname))
 
 (defmethod dom:get-element-by-id ((document document) id)
-  (block nil
+  (block t
     (unless (dtd document)
-      (return nil))
+      (return-from t nil))
     (setf id (%rod id))
     (labels ((walk (n)
 	       (dovector (c (dom:child-nodes n))
@@ -441,7 +441,7 @@
 			   (let* ((name (rod (cxml::attdef-name a)))
 				  (value (dom:get-attribute c name)))
 			     (when (and value (rod= value id))
-			       (return c)))))))
+			       (return-from t c)))))))
 		   (walk c)))))
       (walk document))))