--- a/EditField.st	Mon Feb 27 16:43:26 2017 +0100
+++ b/EditField.st	Tue Feb 28 15:52:09 2017 +0100
@@ -1853,10 +1853,8 @@
     super hasKeyboardFocus:aBoolean.
 
     (acceptOnLostFocus and:[enabled and:[aBoolean not and:[hadKeyboardFocus]]]) ifTrue:[
-        model notNil ifTrue:[
-            model value = self argForChangeMessage ifTrue:[
-                ^ self
-            ]
+        (model notNil and:[model value = self argForChangeMessage]) ifTrue:[
+            ^ self
         ].
         self accept.
     ].