diff --git a/ChangeLog b/ChangeLog
index 743fd0c69..cde34b41e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-09  David Wetzel <dave@turbocat.de>
+	* Source/Additions/GSXML.m:
+	check for NULL string
+	stringWithUTF8String: raises on OSX if you feed it with a NULL string.
+	
 2010-06-09  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* configure.ac: Check for gcrypt library for TLS
diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m
index f527a1439..76b546893 100644
--- a/Source/Additions/GSXML.m
+++ b/Source/Additions/GSXML.m
@@ -120,6 +120,10 @@ static SEL usSel;
 inline static NSString*
 UTF8Str(const unsigned char *bytes)
 {
+  // stringWithUTF8String: raises on OSX if you feed it with a NULL string.
+  if ((bytes == NULL)) {
+    return nil;
+  }
   return (*usImp)(NSString_class, usSel, bytes);
 }