--- a/ImageEditor.st	Fri Jul 31 01:58:25 1998 +0200
+++ b/ImageEditor.st	Fri Jul 31 02:10:02 1998 +0200
@@ -717,7 +717,7 @@
                           #translateLabel: true
                           #value: #doSaveMethod
                           #activeHelpKey: #fileSaveMethod
-                          #enabled: #imageIsLoaded
+                          #enabled: #imageIsLoadedAndClassDefined
                       )
                        #(#MenuItem
                           #label: 'Save As...'
@@ -761,7 +761,7 @@
                           #translateLabel: true
                           #value: #doBrowseClass
                           #activeHelpKey: #fileBrowseClass
-                          #enabled: #imageIsLoaded
+                          #enabled: #hasClassDefined
                       )
                        #(#MenuItem
                           #label: '-'
@@ -906,8 +906,8 @@
                        #(#MenuItem
                           #label: 'Compress colormap'
                           #translateLabel: true
+                          #value: #compressColorMap
                           #activeHelpKey: #compressColormap
-                          #value: #compressColorMap
                       )
                     ) nil
                     nil
@@ -955,7 +955,7 @@
           nil
       )
 
-    "Modified: / 29.7.1998 / 22:26:55 / cg"
+    "Modified: / 31.7.1998 / 02:04:49 / cg"
 !
 
 menuMouseButtonColors
@@ -1161,6 +1161,19 @@
     "Created: / 26.7.1998 / 12:17:03 / cg"
 !
 
+hasClassAndSelectorDefined
+    ^ [(Smalltalk at:(imageEditView resourceClass) ifAbsent:nil) notNil
+       and:[imageEditView resourceSelector notNil]]
+
+    "Created: / 31.7.1998 / 02:02:54 / cg"
+!
+
+hasClassDefined
+    ^ [(Smalltalk at:(imageEditView resourceClass) ifAbsent:nil) notNil]
+
+    "Created: / 31.7.1998 / 02:02:22 / cg"
+!
+
 imageInfoHolder
     |holder|
     (holder := builder bindingAt:#imageInfoHolder) isNil ifTrue:[
@@ -1181,6 +1194,15 @@
     ^ holder
 !
 
+imageIsLoadedAndClassDefined
+    "returns whether an image is loaded as value holder"
+
+    ^ [self hasClassAndSelectorDefined value
+       and:[self imageIsLoaded value]]
+
+    "Created: / 31.7.1998 / 02:04:18 / cg"
+!
+
 listOfColors
     "returns the list of colors in a List"
 
@@ -1793,7 +1815,15 @@
 doBrowseClass
     "opens a System Browser on the resourceClass and the resourceSelector"
 
-    SystemBrowser openInClass: (Smalltalk at: imageEditView resourceClass ifAbsent: [^nil]) class selector: imageEditView resourceSelector
+    |cls|
+
+    cls := Smalltalk at:(imageEditView resourceClass) ifAbsent:nil.
+    cls isNil ifTrue:[^ self warn:'No Class specified'].
+    SystemBrowser 
+        openInClass:cls class 
+        selector:(imageEditView resourceSelector)
+
+    "Modified: / 31.7.1998 / 02:01:15 / cg"
 !
 
 doChangeGridMagnification