--- a/EditFieldWithCompletion.st	Fri Jun 24 16:08:44 2016 +0200
+++ b/EditFieldWithCompletion.st	Wed Jun 29 18:44:06 2016 +0200
@@ -354,6 +354,7 @@
     
     best := completionInfo first.
     options := completionInfo second.
+    best isNil ifTrue:[self halt ].
 "/    (options includes:best) ifFalse:[
 "/        best := options 
 "/                    detect:[:e | e asString startsWith:best asString ]
@@ -402,7 +403,7 @@
     optionsView := SelectionInListModelView new
                     textStartLeft: textStartLeft - 2;
                     listHolder: optionsHolder;
-                    action:[:value | self contents:value asString ];
+                    action:[:value | value notNil ifTrue:[ self contents:value asString ] ];
                     doubleClickAction:[:index | 
                             self contents:(optionsView at:index) asString.
                             self hideOptionsWindow.