--- glyphs-x.c~	Sat Jan 29 12:29:08 2000
+++ glyphs-x.c	Sun Feb 06 09:26:39 2000
@@ -408,7 +408,8 @@
 #endif
 	      lw_destroy_widget (IMAGE_INSTANCE_X_WIDGET_ID (p));
 	      lw_destroy_widget (IMAGE_INSTANCE_X_CLIPWIDGET (p));
-	      IMAGE_INSTANCE_SUBWINDOW_ID (p) = 0;
+	      IMAGE_INSTANCE_X_WIDGET_ID (p) = 0;
+	      IMAGE_INSTANCE_X_CLIPWIDGET (p) = 0;
 	    }
 	}
       else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
@@ -2281,10 +2282,14 @@
 		     IMAGE_INSTANCE_X_SUBWINDOW_ID (ii),
 		     w, h);
     }
-  else				/* must be a widget */
+  else if (IMAGE_INSTANCE_TYPE (ii) == IMAGE_SUBWINDOW)
     {
       Arg al[2];
 
+      assert (IMAGE_INSTANCE_X_WIDGET_ID (ii)
+	      &&
+	      IMAGE_INSTANCE_X_CLIPWINDOW (ii));
+
       if ( !XtIsManaged(IMAGE_INSTANCE_X_WIDGET_ID (ii)) 
 	   ||
 	   IMAGE_INSTANCE_X_WIDGET_ID (ii)->core.being_destroyed ) 
@@ -2298,6 +2303,8 @@
       XtSetArg (al [1], XtNheight, (Dimension)h);
       XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 2);
     }
+  else
+    abort ();
 }