--- a/ComboListView.st	Thu Sep 24 13:53:26 2015 +0200
+++ b/ComboListView.st	Tue Sep 29 18:56:15 2015 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libwidg2' }"
 
+"{ NameSpace: Smalltalk }"
+
 ComboView subclass:#ComboListView
 	instanceVariableNames:'useIndex values selectCondition'
 	classVariableNames:''
@@ -756,7 +758,9 @@
 
         selection notNil ifTrue:[
             values notNil ifTrue:[
-                idx := values indexOf:selection.
+                list notNil ifTrue:[
+                    idx := values indexOf:selection.
+                ].    
                 newContents := selection.
             ] ifFalse:[
                 useIndex ifTrue:[
@@ -793,6 +797,6 @@
 !ComboListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ComboListView.st,v 1.55 2014-12-03 23:49:30 cg Exp $'
+    ^ '$Header$'
 ! !