diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index a3625d417..45cce242a 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -39,6 +39,7 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.nostra13.universalimageloader.cache.disc.impl.LimitedAgeDiskCache;
@@ -63,6 +64,8 @@ import java.util.Set;
 
 public class FDroidApp extends Application {
 
+    private static final String TAG = "FDroidApp";
+
     // for the local repo on this device, all static since there is only one
     public static int port;
     public static String ipAddressString;
@@ -295,8 +298,8 @@ public class FDroidApp extends Application {
                     break;
                 }
             }
-        } catch (PackageManager.NameNotFoundException e1) {
-            e1.printStackTrace();
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Could not get application info to send via bluetooth", e);
             found = false;
         }
         if (sendBt != null) {
@@ -351,7 +354,7 @@ public class FDroidApp extends Application {
                 Message msg = Message.obtain(null, LocalRepoService.RESTART, LocalRepoService.RESTART, 0);
                 localRepoServiceMessenger.send(msg);
             } catch (RemoteException e) {
-                e.printStackTrace();
+                Log.e(TAG, "Could not reset local repo service", e);
             }
         }
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/NfcHelper.java b/F-Droid/src/org/fdroid/fdroid/NfcHelper.java
index 45a56164e..17eba082e 100644
--- a/F-Droid/src/org/fdroid/fdroid/NfcHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/NfcHelper.java
@@ -10,9 +10,12 @@ import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
 import android.os.Build;
+import android.util.Log;
 
 public class NfcHelper {
 
+    private static final String TAG = "NfcHelper";
+
     @TargetApi(14)
     private static NfcAdapter getAdapter(Context context) {
         if (Build.VERSION.SDK_INT < 14)
@@ -48,7 +51,7 @@ public class NfcHelper {
                 };
                 nfcAdapter.setBeamPushUris(uris, activity);
             } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
+                Log.e(TAG, "Could not get application info", e);
             }
         }
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java
index a9d7d7370..ceaf243fa 100644
--- a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java
+++ b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java
@@ -76,7 +76,7 @@ public class RepoUpdater {
             String versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
             urlString += "?client_version=" + versionName;
         } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
+            Log.e(TAG, "Could not get client version name", e);
         }
         return new URL(urlString);
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
index 4f3182037..faec92417 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
@@ -100,9 +100,7 @@ public class InstalledAppProvider extends FDroidProvider {
         try {
             appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
             return appInfo.loadLabel(pm).toString();
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        } catch (Resources.NotFoundException e) {
+        } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {
             Utils.DebugLog(TAG, "Could not get application label", e);
         }
         return packageName; // all else fails, return id
diff --git a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
index 43b8205df..56cf90134 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java
@@ -7,6 +7,7 @@ import android.net.wifi.WifiManager.MulticastLock;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -105,7 +106,7 @@ public class MDnsHelper implements ServiceListener {
                     };
                     mJmdns = JmDNS.create(InetAddress.getByAddress(byteIp));
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    Log.e(TAG, "An error occured while discovering services", e);
                 }
                 return null;
             }
diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index 3c4930abd..398e65d59 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -171,8 +171,8 @@ public class WifiStateChangeService extends Service {
                     }
                 }
             }
-        } catch (SocketException ex) {
-            ex.printStackTrace();
+        } catch (SocketException e) {
+            Log.e(TAG, "Could not get ip address", e);
         }
 
         return null;
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
index 2c556bf14..2857b4518 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java
@@ -10,6 +10,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
 import android.view.MenuItem;
 import android.widget.Toast;
 
@@ -268,7 +269,7 @@ public class SwapActivity extends ActionBarActivity implements SwapProcessManage
                     }
                 }.execute();
             } catch (Exception e) {
-                e.printStackTrace();
+                Log.e(TAG, "An error occured while setting up the local repo", e);
             }
             return null;
         }