--- a/Tools__ObjectModuleInformation.st	Wed Mar 13 17:05:09 2013 +0100
+++ b/Tools__ObjectModuleInformation.st	Wed Mar 13 18:35:46 2013 +0100
@@ -304,13 +304,13 @@
                   translateLabel: true
                 )
                (MenuItem
-                  enabled: canUnloadSelectedDLL
+                  enabled: canUnloadSelectedModule
                   label: 'Remove Classes && Unload DLL...'
                   itemValue: unloadSelectedModuleAndRemoveClasses
                   translateLabel: true
                 )
                (MenuItem
-                  enabled: canUnloadSelectedModule
+                  enabled: canUnloadSelectedDLL
                   label: 'Unload DLL...'
                   itemValue: unloadSelectedModule
                   translateLabel: true
@@ -1351,8 +1351,10 @@
 
 Continue ?') 
                 ifFalse:[ ^ self ].
+        handle := module handle.
+    ] ifFalse:[
+        handle := objectHandles at:self selectedModuleIndex ifAbsent:nil.
     ].
-    handle := module handle.
     handle notNil ifTrue:[
         self 
             withWaitCursorDo:[