diff --git a/ChangeLog b/ChangeLog
index 31707b0da..bc570ec0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2012-03-20  Richard Frith-Macdonald <rfm@gnu.org>
+2013-03-23  Fred Kiefer <FredKiefer@gmx.de>
+
+        * Source/NSXMLNode.m (-XMLStringWithOptions:): Revert change I
+	made on 2012-12-01.
+
+2013-03-20  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Tests/base/NSCalendar/features-10-7.m:
         * Source/NSCalendar.m:
@@ -6,7 +11,7 @@
         New OSX 10.7 methods supplied by Lobos Dolezel and rewritten somewhat
         to avoid breaking binary compatibility.
 
-2012-03-17  Richard Frith-Macdonald <rfm@gnu.org>
+2013-03-17  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Source/GSSet.m: Some optimisation for set intersection.
 
diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m
index 6fc2d071b..95d9ee172 100644
--- a/Source/NSXMLNode.m
+++ b/Source/NSXMLNode.m
@@ -1986,6 +1986,11 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
   int xmlOptions = 0;
 
   buffer = xmlBufferCreate();
+  if (buffer == NULL)
+    {
+      // FIXME: xmlGetLastError()
+      return nil;
+    }
 
   // XML_SAVE_XHTML XML_SAVE_AS_HTML XML_SAVE_NO_DECL XML_SAVE_NO_XHTML
 #if LIBXML_VERSION >= 20702
@@ -2035,11 +2040,8 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
       xmlBufferFree(buffer);
       return nil;
     }
-#if LIBXML_VERSION < 20900
+
   string = StringFromXMLString(buffer->content, buffer->use);
-#else
-  string = StringFromXMLString(xmlBufContent(buffer), xmlBufUse(buffer));
-#endif
   xmlBufferFree(buffer);
 
   if ([self kind] == NSXMLTextKind)