diff --git a/ChangeLog b/ChangeLog
index 2d0e5908e..e83bb8935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Source/GNUmakefile: Make GNUstep.h public.
 	* Source/Additions/GSXML.m: Use cached NSString class variable. 
+	* Source/Additions/GSObjCRuntime.m
+	(GSCGetInstanceVariableDefinition): Make more robust.
 
 2003-07-11  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index fa7b8144a..50c1db30e 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -682,8 +682,12 @@ GSCGetInstanceVariableDefinition(Class class, const char *name)
 {
   struct objc_ivar_list *list;
   int i;
+
+  if (class == 0)
+    return 0;
+
   list = class->ivars;
-  for (i = 0; i < list->ivar_count; i++)
+  for (i = 0; (list != 0) && i < list->ivar_count; i++)
     {
       if (strcmp (list->ivar_list[i].ivar_name, name) == 0)
 	return &(list->ivar_list[i]);