diff --git a/DroidFishApp/src/main/java/org/petero/droidfish/activities/GameAdapter.java b/DroidFishApp/src/main/java/org/petero/droidfish/activities/GameAdapter.java
index 68e35ed..16cbeb5 100644
--- a/DroidFishApp/src/main/java/org/petero/droidfish/activities/GameAdapter.java
+++ b/DroidFishApp/src/main/java/org/petero/droidfish/activities/GameAdapter.java
@@ -112,7 +112,7 @@ public class GameAdapter<T> extends BaseAdapter implements Filterable {
         @SuppressWarnings("unchecked")
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
-            values = (ArrayList<T>) results.values;
+            values = results == null ? new ArrayList<T>() : (ArrayList<T>) results.values;
             notifyDataSetChanged();
         }
     }