diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 801a5be43..531c22d04 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -636,9 +636,11 @@ public class DB {
             while (!c.isAfterLast()) {
                 CommaSeparatedList categories = CommaSeparatedList
                     .make(c.getString(0));
-                for (String category : categories) {
-                    if (!result.contains(category)) {
-                        result.add(category);
+                if (categories != null) {
+                    for (String category : categories) {
+                        if (!result.contains(category)) {
+                            result.add(category);
+                        }
                     }
                 }
                 c.moveToNext();