diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java
index da66d4f7f..757def9db 100644
--- a/src/org/fdroid/fdroid/ManageRepo.java
+++ b/src/org/fdroid/fdroid/ManageRepo.java
@@ -59,9 +59,10 @@ public class ManageRepo extends FragmentActivity {
         ActionBarCompat.create(this).setDisplayHomeAsUpEnabled(true);
     }
 
+    @Override
     public void finish() {
         Intent ret = new Intent();
-        if (listFragment.hasChanged()) {
+        if (listFragment != null && listFragment.hasChanged()) {
             Log.i("FDroid", "Repo details have changed, prompting for update.");
             ret.putExtra(REQUEST_UPDATE, true);
         }