diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index a58edd30d..d784a2f6e 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -217,6 +217,7 @@ task pmd(type: Pmd, dependsOn: assembleDebug) {
     ruleSets = [
         //'java-basic',
         //'java-unusedcode',
+        'java-android',
     ]
     source 'src'
     include '**/org/fdroid/**/*.java'
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index 37dc218cd..9db97b91d 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -176,6 +176,7 @@ public class FDroidApp extends Application {
     @TargetApi(9)
     @Override
     public void onCreate() {
+        super.onCreate();
         if (Build.VERSION.SDK_INT >= 9 && BuildConfig.DEBUG) {
             StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
                     .detectAll()
@@ -187,7 +188,6 @@ public class FDroidApp extends Application {
                     .build());
         }
         updateLanguage();
-        super.onCreate();
         ACRA.init(this);
 
         // Needs to be setup before anything else tries to access it.
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
index e5e7aabc0..a9dcebeab 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
@@ -595,12 +595,12 @@ public class SwapService extends Service {
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
         Utils.debugLog(TAG, "Destroying service, will disable swapping if required, and unregister listeners.");
         disableAllSwapping();
         Preferences.get().unregisterLocalRepoHttpsListeners(httpsEnabledListener);
         LocalBroadcastManager.getInstance(this).unregisterReceiver(onWifiChange);
         LocalBroadcastManager.getInstance(this).unregisterReceiver(receiveSwapStatusChanged);
+        super.onDestroy();
     }
 
     private Notification createNotification() {