--- a/mojoshader_common.c	Thu Jun 07 04:31:01 2012 -0400
+++ b/mojoshader_common.c	Fri Aug 03 13:39:36 2012 -0400
@@ -259,7 +259,8 @@
     HashTable_NukeFn nuke = copy ? stringmap_nuke : stringmap_nuke_noop;
     StringMap *smap;
     smap = hash_create(0,hash_hash_string,hash_keymatch_string,nuke,0,m,f,d);
-    smap->data = smap;
+    if (smap != NULL)
+        smap->data = smap;
     return smap;
 } // stringmap_create