diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java
index 607d3d7f6..054a115a4 100644
--- a/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -20,6 +20,7 @@
 package org.fdroid.fdroid;
 
 import android.os.Bundle;
+
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.Repo;
@@ -29,7 +30,8 @@ import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class RepoXMLHandler extends DefaultHandler {
 
@@ -279,7 +281,8 @@ public class RepoXMLHandler extends DefaultHandler {
         } else if (localName.equals("application") && curapp == null) {
             curapp = new App();
             curapp.id = attributes.getValue("", "id");
-            if (progressCounter % (totalAppCount / 25) == 0) {
+            /* show progress for the first 25, then start skipping every 25 */
+            if (totalAppCount < 25 || progressCounter % (totalAppCount / 25) == 0) {
                 Bundle data = new Bundle(1);
                 data.putString(RepoUpdater.PROGRESS_DATA_REPO_ADDRESS, repo.address);
                 progressListener.onProgress(
diff --git a/src/org/fdroid/fdroid/views/ManageReposActivity.java b/src/org/fdroid/fdroid/views/ManageReposActivity.java
index 7c22c7c5d..3b4f67dcf 100644
--- a/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -463,7 +463,10 @@ public class ManageReposActivity extends ActionBarActivity {
         if (!TextUtils.isEmpty(newRepo.getBssid())) {
             WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
             WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-            String bssid = wifiInfo.getBSSID().toLowerCase(Locale.ENGLISH);
+            String bssid = wifiInfo.getBSSID();
+            if (TextUtils.isEmpty(bssid)) /* not all devices have wifi */
+                return;
+            bssid = bssid.toLowerCase(Locale.ENGLISH);
             String newRepoBssid = Uri.decode(newRepo.getBssid()).toLowerCase(Locale.ENGLISH);
             if (!bssid.equals(newRepoBssid)) {
                 String msg = String.format(getString(R.string.not_on_same_wifi), newRepo.getSsid());