diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
index dd358f00b..faccfd992 100644
--- a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
+++ b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java
@@ -372,7 +372,9 @@ public final class LocalRepoManager {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
             // max age is an EditTextPreference, which is always a String
-            int repoMaxAge = Float.valueOf(prefs.getString("max_repo_age_days", DEFAULT_REPO_MAX_AGE_DAYS)).intValue();
+            // TODO: This pref is probably never being set. Also, why
+            // are we mixing floats and ints?
+            int repoMaxAge = Float.valueOf(prefs.getString("max_repo_age_days", DEFAULT_REPO_MAX_AGE_DAYS)).intValue(); // NOPMD
 
             serializer.startTag("", "repo");
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
index d7b42505d..dd360fcb7 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
@@ -96,10 +96,12 @@ public class SwapAppsView extends ListView implements
         super.onFinishInflate();
         repo = getActivity().getState().getPeerRepo();
 
+        /*
         if (repo == null) {
-            // TODO: Uh oh, something stuffed up for this to happen.
-            // TODO: What is the best course of action from here?
+            TODO: Uh oh, something stuffed up for this to happen.
+            TODO: What is the best course of action from here?
         }
+        */
 
         adapter = new AppListAdapter(getContext(), getContext().getContentResolver().query(
                 AppProvider.getRepoUri(repo), AppProvider.DataColumns.ALL, null, null, null));
diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
index 6ad35b90e..3e4600f4e 100644
--- a/config/pmd/rules.xml
+++ b/config/pmd/rules.xml
@@ -17,9 +17,14 @@
     <rule ref="rulesets/java/unnecessary.xml">
         <exclude name="UselessParentheses"/> <!--Too nitpicky-->
     </rule>
+    <rule ref="rulesets/java/empty.xml">
+        <exclude name="EmptyCatchBlock"/> <!--Ignoring an exception-->
+        <exclude name="EmptyWhileStmt"/> <!--Can be useful sometimes-->
+    </rule>
     <rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/>
     <rule ref="rulesets/java/optimizations.xml/AddEmptyString"/>
     <rule ref="rulesets/java/optimizations.xml/UseArraysAsList"/>
+    <rule ref="rulesets/java/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
 
     <rule ref="rulesets/java/controversial.xml/UnnecessaryConstructor"/>
     <rule ref="rulesets/java/controversial.xml/UnnecessaryParentheses"/>