--- a/SourceCodeManagerUtilities.st	Sun Feb 05 19:13:56 2012 +0100
+++ b/SourceCodeManagerUtilities.st	Fri Feb 10 18:41:56 2012 +0100
@@ -2052,12 +2052,16 @@
         diffSet := listHere diffSetsAgainst:listRep.
         changed := diffSet changed.
         onlyHere := diffSet onlyInReceiver.
-        onlyHere := onlyHere select:[:eachDiff|  |methodsPackage|
-                eachDiff isClassDefinitionChange not and:[
-                    methodsPackage := (eachDiff changeClass compiledMethodAt:eachDiff selector) package.
-                    methodsPackage == containerPackage
-                ]
-            ].
+        onlyHere := onlyHere select:[:eachDiff|  
+                        |method methodsPackage|
+                        eachDiff isClassDefinitionChange not 
+                        and:[
+                            eachDiff changeClass isNil
+                            or:[
+                                method := (eachDiff changeClass compiledMethodAt:eachDiff selector).
+                                method isNil or:[ (methodsPackage := method package) == containerPackage ]]
+                        ]
+                    ].
 
         onlyInRep := diffSet onlyInArg.
 
@@ -2191,7 +2195,7 @@
                  eachChange isMethodChange ifTrue:[
                      cClass := eachChange changeClass.
                      cSel := eachChange selector.
-                     cClass basicRemoveSelector:cSel.
+                     cClass notNil ifTrue:[ cClass basicRemoveSelector:cSel ].
                  ]
             ].
 
@@ -2286,7 +2290,7 @@
     ].
 
     "Modified: / 07-02-2001 / 18:18:32 / ps"
-    "Modified: / 05-12-2011 / 21:29:32 / cg"
+    "Modified: / 10-02-2012 / 17:37:55 / cg"
 !
 
 checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge usingManager:aSourceCodeManager
@@ -4370,9 +4374,9 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.240 2012-01-14 19:59:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.241 2012-02-10 17:41:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.240 2012-01-14 19:59:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.241 2012-02-10 17:41:56 cg Exp $'
 ! !