diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index 295032086..7fca11add 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -155,7 +155,7 @@ abstract public class Installer {
         }
 
         // special case: Install F-Droid Privileged
-        if (packageName.equals(PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME)) {
+        if (packageName != null && packageName.equals(PrivilegedInstaller.PRIVILEGED_PACKAGE_NAME)) {
             Activity activity;
             try {
                 activity = (Activity) mContext;
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index cb8e5ee11..df2f96cdd 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -791,7 +791,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             public void onProgress(Event event) {
                 switch (event.type) {
                     case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE:
-                        handleDownloadComplete(downloader.localFile());
+                        handleDownloadComplete(downloader.localFile(), app.id);
                         break;
                     case ApkDownloader.EVENT_ERROR:
                         break;
@@ -801,7 +801,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         downloader.download();
     }
 
-    private void handleDownloadComplete(File apkFile) {
+    private void handleDownloadComplete(File apkFile, String packageName) {
 
         try {
             Installer.getActivityInstaller(SwapWorkflowActivity.this, new Installer.InstallerCallback() {
@@ -816,7 +816,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                 public void onError(int operation, int errorCode) {
                     // TODO: Boo!
                 }
-            }).installPackage(apkFile);
+            }).installPackage(apkFile, packageName);
         } catch (Installer.AndroidNotCompatibleException e) {
             // TODO: Handle exception properly
         }