--- a/MCMethodDefinition.st	Fri Aug 31 12:04:14 2012 +0200
+++ b/MCMethodDefinition.st	Mon Sep 10 14:28:47 2012 +0200
@@ -204,7 +204,7 @@
 !
 
 load
-    | env package oldMethod newMethod |
+    | env package oldMethod newMethod actualClass|
 
     env := MCStXNamespaceQuery query ? Smalltalk.
     (env ~~ Smalltalk) ifTrue:[
@@ -212,12 +212,18 @@
     ].
 
     package := MCStXPackageQuery query.
-    oldMethod := self actualClass compiledMethodAt: self selector.
+    actualClass := self actualClass.
+    actualClass isNil ifTrue:[
+        Transcript showCR:('missing class: %1 (for %2)' bindWith:className with:selector).
+        self error:('missing class: %1' bindWith:className) mayProceed:true.
+        ^ self "/ proceeded
+    ].
+    oldMethod := actualClass compiledMethodAt: self selector.
     (oldMethod notNil and:[oldMethod package ~= package])
         ifTrue:[Class methodRedefinitionNotification
                     raiseRequestWith: (oldMethod -> self)].
 
-    newMethod := self actualClass
+    newMethod := actualClass
                 compile: source asStringWithNativeLineEndings
                 classified: category
                 withStamp: timeStamp
@@ -225,7 +231,7 @@
     newMethod package: package
 
     "Modified: / 08-11-2010 / 20:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 07-09-2011 / 15:22:53 / cg"
+    "Modified: / 10-09-2012 / 14:13:42 / cg"
 !
 
 postloadOver: aDefinition
@@ -402,11 +408,11 @@
 !MCMethodDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMethodDefinition.st,v 1.8 2011-09-07 13:43:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMethodDefinition.st,v 1.9 2012-09-10 12:28:47 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMethodDefinition.st,v 1.8 2011-09-07 13:43:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMethodDefinition.st,v 1.9 2012-09-10 12:28:47 cg Exp $'
 !
 
 version_SVN