diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
index 6c50b176..e76071a0 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
@@ -271,12 +271,7 @@ public class AppSettings {
      * @return proxy port
      */
     public int getProxyPort() {
-        try {
-            return Integer.parseInt(getString(prefApp, R.string.pref_key__http_proxy_port, "0"));
-        } catch (Exception e) {
-            setString(prefApp, R.string.pref_key__http_proxy_port, "0");
-            return 0;
-        }
+        return getInt(prefApp, R.string.pref_key__http_proxy_port, 0);
     }
 
     public void setProxyHttpPort(int value) {
diff --git a/build.gradle b/build.gradle
index 54903cde..d4c9c424 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
 
         // NOTE: Do not place your application dependencies here; they belong