diff --git a/ChangeLog b/ChangeLog
index 29d93fb36..02dde71a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-18 16:21-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/NSXMLNode.m: fixes for issues found in GNUstep unit
+	tests.
+
 2012-01-18 12:52-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSXMLDTDNode.m: Remove uneeded releases in dealloc.
diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m
index a73ed1a7c..78de03e19 100644
--- a/Source/NSXMLNode.m
+++ b/Source/NSXMLNode.m
@@ -510,6 +510,11 @@ NSArray *execute_xpath(NSXMLNode *node,
       xmlNodePtr children = NULL;
       xmlNodePtr node = (xmlNodePtr)(internal->node);
       
+      if(node->children == NULL)
+	{
+	  return nil;
+	}
+
       childrenArray = [NSMutableArray array];
       for (children = node->children; children; children = children->next)
 	{
@@ -977,6 +982,11 @@ NSArray *execute_xpath(NSXMLNode *node,
 
 - (void) setObjectValue: (id)value
 {
+  if(nil == value)
+    {
+      ASSIGN(internal->objectValue, [NSString stringWithString: @""]);
+      return;
+    }
   ASSIGN(internal->objectValue, value);
 }