--- a/MCTraitDefinition.st	Fri Jan 18 14:02:42 2013 +0100
+++ b/MCTraitDefinition.st	Fri Jan 18 14:02:43 2013 +0100
@@ -38,15 +38,15 @@
 !
 
 requirements
-	"Assuming that traits in a composition can be identified by
-	testing for the first character beeing an uppercase character
-	(and thus not a special character such as {, # etc.)"
+        "Assuming that traits in a composition can be identified by
+        testing for the first character beeing an uppercase character
+        (and thus not a special character such as {, # etc.)"
 
-	| tokens traitNames |
-	self hasTraitComposition ifFalse: [ ^Array new ].
-	tokens := Scanner new scanTokens: self traitComposition.
-	traitNames := tokens select: [:each | each first isUppercase].
-	^traitNames asArray
+        | tokens traitNames |
+        self hasTraitComposition ifFalse: [ ^Array new ].
+        tokens := Scanner new scanTokens: self traitComposition.
+        traitNames := tokens select: [:each | each isString and:[each first isUppercase]].
+        ^traitNames asArray
 ! !
 
 !MCTraitDefinition methodsFor:'initializing'!
@@ -127,13 +127,14 @@
 !MCTraitDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCTraitDefinition.st,v 1.3 2012-09-11 21:29:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCTraitDefinition.st,v 1.4 2013-01-18 13:02:43 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCTraitDefinition.st,v 1.3 2012-09-11 21:29:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCTraitDefinition.st,v 1.4 2013-01-18 13:02:43 cg Exp $'
 !
 
 version_SVN
     ^ '§Id: MCTraitDefinition.st 17 2010-10-13 12:07:52Z vranyj1 §'
 ! !
+