diff --git a/evaluate.py b/evaluate.py
index 611c03ba..3891e9f2 100644
--- a/evaluate.py
+++ b/evaluate.py
@@ -133,7 +133,7 @@ class Executable(object):
             while key:
                 try:
                     key_param = param_dict[key]
-                except IndexError:
+                except KeyError:
                     non_matching_keys.append((key, value))
                 else:
                     result.append(gen_param_name_copy(key_param,
diff --git a/test/completion/functions.py b/test/completion/functions.py
index 1bb440c2..7736a801 100644
--- a/test/completion/functions.py
+++ b/test/completion/functions.py
@@ -113,8 +113,8 @@ def kwargs_func(**kwargs):
     return kwargs
 
 exe = kwargs_func(a=3,b=4)
-#? []
-exe.
+#? ['items']
+exe.items
 
 # -----------------
 # *args / ** kwargs