diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index c4aebe5e0..20bbeb499 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -378,10 +378,12 @@ public class DB {
                 StringBuilder logMsg = new StringBuilder();
                 logMsg.append("Available device features:");
                 features = new HashSet<String>();
-                for (FeatureInfo fi : pm.getSystemAvailableFeatures()) {
-                    features.add(fi.name);
-                    logMsg.append('\n');
-                    logMsg.append(fi.name);
+                if (pm != null) {
+                    for (FeatureInfo fi : pm.getSystemAvailableFeatures()) {
+                        features.add(fi.name);
+                        logMsg.append('\n');
+                        logMsg.append(fi.name);
+                    }
                 }
 
                 cpuAbis = new ArrayList<String>();
@@ -866,8 +868,10 @@ public class DB {
                     if (app.installedVersion == null)
                         app.installedVersion = "null";
                     app.installedVerCode = sysapk.versionCode;
-                    app.userInstalled = ((sysapk.applicationInfo.flags
-                            & ApplicationInfo.FLAG_SYSTEM) != 1);
+                    if (sysapk.applicationInfo != null) {
+                        app.userInstalled = ((sysapk.applicationInfo.flags
+                                & ApplicationInfo.FLAG_SYSTEM) != 1);
+                    }
                 } else {
                     app.installedVersion = null;
                     app.installedVerCode = 0;