diff --git a/ext/dom/document.c b/ext/dom/document.c
index c1a314c00fd..31081a4b8c2 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -904,52 +904,52 @@ PHP_METHOD(DOM_Document, createAttributeNS)
 	root = xmlDocGetRootElement(docp);
 	if (root != NULL) {
 		errorcode = dom_check_qname(ZSTR_VAL(name), &localname, &prefix, uri_len, ZSTR_LEN(name));
-		/* TODO: switch to early goto-out style error-checking */
-		if (errorcode == 0) {
-			if (xmlValidateName((xmlChar *) localname, 0) == 0) {
-				/* If prefix is "xml" and namespace is not the XML namespace, then throw a "NamespaceError" DOMException. */
-				if (UNEXPECTED(!zend_string_equals_literal(uri, "http://www.w3.org/XML/1998/namespace") && xmlStrEqual(BAD_CAST prefix, BAD_CAST "xml"))) {
-					errorcode = NAMESPACE_ERR;
-					goto error;
-				}
-				/* If either qualifiedName or prefix is "xmlns" and namespace is not the XMLNS namespace, then throw a "NamespaceError" DOMException. */
-				if (UNEXPECTED((zend_string_equals_literal(name, "xmlns") || xmlStrEqual(BAD_CAST prefix, BAD_CAST "xmlns")) && !zend_string_equals_literal(uri, "http://www.w3.org/2000/xmlns/"))) {
-					errorcode = NAMESPACE_ERR;
-					goto error;
-				}
-				/* If namespace is the XMLNS namespace and neither qualifiedName nor prefix is "xmlns", then throw a "NamespaceError" DOMException. */
-				if (UNEXPECTED(zend_string_equals_literal(uri, "http://www.w3.org/2000/xmlns/") && !zend_string_equals_literal(name, "xmlns") && !xmlStrEqual(BAD_CAST prefix, BAD_CAST "xmlns"))) {
-					errorcode = NAMESPACE_ERR;
-					goto error;
-				}
+		if (UNEXPECTED(errorcode != 0)) {
+			goto error;
+		}
+		if (UNEXPECTED(xmlValidateName((xmlChar *) localname, 0) != 0)) {
+			errorcode = INVALID_CHARACTER_ERR;
+			goto error;
+		}
+		/* If prefix is "xml" and namespace is not the XML namespace, then throw a "NamespaceError" DOMException. */
+		if (UNEXPECTED(!zend_string_equals_literal(uri, "http://www.w3.org/XML/1998/namespace") && xmlStrEqual(BAD_CAST prefix, BAD_CAST "xml"))) {
+			errorcode = NAMESPACE_ERR;
+			goto error;
+		}
+		/* If either qualifiedName or prefix is "xmlns" and namespace is not the XMLNS namespace, then throw a "NamespaceError" DOMException. */
+		if (UNEXPECTED((zend_string_equals_literal(name, "xmlns") || xmlStrEqual(BAD_CAST prefix, BAD_CAST "xmlns")) && !zend_string_equals_literal(uri, "http://www.w3.org/2000/xmlns/"))) {
+			errorcode = NAMESPACE_ERR;
+			goto error;
+		}
+		/* If namespace is the XMLNS namespace and neither qualifiedName nor prefix is "xmlns", then throw a "NamespaceError" DOMException. */
+		if (UNEXPECTED(zend_string_equals_literal(uri, "http://www.w3.org/2000/xmlns/") && !zend_string_equals_literal(name, "xmlns") && !xmlStrEqual(BAD_CAST prefix, BAD_CAST "xmlns"))) {
+			errorcode = NAMESPACE_ERR;
+			goto error;
+		}
 
-				nodep = (xmlNodePtr) xmlNewDocProp(docp, (xmlChar *) localname, NULL);
-				if (UNEXPECTED(nodep == NULL)) {
-					php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
-					RETURN_THROWS();
-				}
+		nodep = (xmlNodePtr) xmlNewDocProp(docp, (xmlChar *) localname, NULL);
+		if (UNEXPECTED(nodep == NULL)) {
+			php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
+			RETURN_THROWS();
+		}
 
-				if (uri_len > 0) {
-					nsptr = xmlSearchNsByHref(docp, root, BAD_CAST ZSTR_VAL(uri));
+		if (uri_len > 0) {
+			nsptr = xmlSearchNsByHref(docp, root, BAD_CAST ZSTR_VAL(uri));
 
-					if (zend_string_equals_literal(name, "xmlns") || xmlStrEqual(BAD_CAST prefix, BAD_CAST "xml")) {
-						if (nsptr == NULL) {
-							nsptr = xmlNewNs(NULL, BAD_CAST ZSTR_VAL(uri), BAD_CAST prefix);
-							php_libxml_set_old_ns(docp, nsptr);
-						}
-					} else {
-						if (nsptr == NULL || nsptr->prefix == NULL) {
-							nsptr = dom_get_ns_unchecked(root, ZSTR_VAL(uri), prefix ? prefix : "default");
-							if (UNEXPECTED(nsptr == NULL)) {
-								errorcode = NAMESPACE_ERR;
-							}
-						}
-					}
-					xmlSetNs(nodep, nsptr);
+			if (zend_string_equals_literal(name, "xmlns") || xmlStrEqual(BAD_CAST prefix, BAD_CAST "xml")) {
+				if (nsptr == NULL) {
+					nsptr = xmlNewNs(NULL, BAD_CAST ZSTR_VAL(uri), BAD_CAST prefix);
+					php_libxml_set_old_ns(docp, nsptr);
 				}
 			} else {
-				errorcode = INVALID_CHARACTER_ERR;
+				if (nsptr == NULL || nsptr->prefix == NULL) {
+					nsptr = dom_get_ns_unchecked(root, ZSTR_VAL(uri), prefix ? prefix : "default");
+					if (UNEXPECTED(nsptr == NULL)) {
+						errorcode = NAMESPACE_ERR;
+					}
+				}
 			}
+			xmlSetNs(nodep, nsptr);
 		}
 	} else {
 		php_error_docref(NULL, E_WARNING, "Document Missing Root Element");
diff --git a/ext/dom/tests/DOMDocument_recover_write.phpt b/ext/dom/tests/DOMDocument_recover_write.phpt
new file mode 100644
index 00000000000..ed16f32c5ef
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_recover_write.phpt
@@ -0,0 +1,16 @@
+--TEST--
+DOMDocument::$recover write
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$dom = new DOMDocument;
+var_dump($dom->recover);
+$dom->recover = true;
+var_dump($dom->recover);
+echo $dom->saveXML();
+?>
+--EXPECT--
+bool(false)
+bool(true)
+<?xml version="1.0"?>
diff --git a/ext/dom/tests/DOMDocument_version_write.phpt b/ext/dom/tests/DOMDocument_version_write.phpt
new file mode 100644
index 00000000000..3f594cb7e4b
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_version_write.phpt
@@ -0,0 +1,33 @@
+--TEST--
+DOMDocument::$version write
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+class MyThrowingStringable {
+    public function __toString(): string {
+        throw new Exception("An exception was thrown");
+    }
+}
+
+$dom = new DOMDocument;
+var_dump($dom->version);
+$dom->version = "foobar";
+var_dump($dom->version);
+echo $dom->saveXML();
+
+try {
+    $dom->version = new MyThrowingStringable;
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+var_dump($dom->version);
+echo $dom->saveXML();
+?>
+--EXPECT--
+string(3) "1.0"
+string(6) "foobar"
+<?xml version="foobar"?>
+An exception was thrown
+string(6) "foobar"
+<?xml version="foobar"?>