--- a/Method.st	Tue Feb 10 21:51:48 2015 +0100
+++ b/Method.st	Fri Feb 13 11:57:16 2015 +0100
@@ -2506,7 +2506,8 @@
 hasAnnotation: key
     "Return true iff the method is annotated with the given key"
 
-    ^(self annotationIndexOf: key) notNil
+    annotations isNil ifTrue:[^ false].
+    ^ (self annotationIndexOf: key) notNil
 
     "Created: / 11-07-2010 / 19:28:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 26-07-2012 / 15:49:54 / cg"
@@ -3418,7 +3419,7 @@
 
 shouldBeSkippedInDebuggersWalkBack
     "return true, if this method thinks, it should be skipped in a walkback.
-     This is done by looking for a #skipInDebuggersWalkBack flag in the methods resources."
+     This is done by looking for a #skipInDebuggersWalkBack flag in the method's resources."
 
     |resources|
 
@@ -3868,11 +3869,11 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.450 2015-02-09 09:34:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.451 2015-02-13 10:57:16 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.450 2015-02-09 09:34:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.451 2015-02-13 10:57:16 cg Exp $'
 !
 
 version_SVN