diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java
index a29aec9d5..e7d566b84 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FacebookKeyserver.java
@@ -19,20 +19,6 @@
 
 package org.sufficientlysecure.keychain.keyimport;
 
-import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.pgp.PgpHelper;
-import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
-import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
-import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
-import org.sufficientlysecure.keychain.util.Log;
-import org.sufficientlysecure.keychain.network.OkHttpClientFactory;
-import org.sufficientlysecure.keychain.util.ParcelableProxy;
-import org.sufficientlysecure.keychain.network.TlsCertificatePinning;
 
 import java.io.IOException;
 import java.net.Proxy;
@@ -41,9 +27,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.network.OkHttpClientFactory;
+import org.sufficientlysecure.keychain.pgp.PgpHelper;
+import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
+import org.sufficientlysecure.keychain.pgp.UncachedPublicKey;
+import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.ParcelableProxy;
 
 public class FacebookKeyserver extends Keyserver {
     private static final String FB_KEY_URL_FORMAT
@@ -132,9 +131,6 @@ public class FacebookKeyserver extends Keyserver {
             throw new QueryFailedException("Cannot connect to Facebook. "
                     + "Check your Internet connection!"
                     + (proxy.getProxy() == Proxy.NO_PROXY ? "" : " Using proxy " + proxy.getProxy()));
-        } catch (TlsCertificatePinning.TlsCertificatePinningException e) {
-            Log.e(Constants.TAG, "Exception in cert pinning", e);
-            throw new QueryFailedException("Exception in cert pinning.");
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/OkHttpKeybaseClient.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/OkHttpKeybaseClient.java
index 2d1de85ba..2a543e66b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/OkHttpKeybaseClient.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/OkHttpKeybaseClient.java
@@ -17,18 +17,15 @@
 
 package org.sufficientlysecure.keychain.network;
 
-import com.textuality.keybase.lib.KeybaseUrlConnectionClient;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.util.Log;
 
 import java.io.IOException;
 import java.net.Proxy;
 import java.net.URL;
 
+import com.textuality.keybase.lib.KeybaseUrlConnectionClient;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
 /**
  * Wrapper for Keybase Lib
  */
@@ -38,15 +35,10 @@ public class OkHttpKeybaseClient implements KeybaseUrlConnectionClient {
     public Response getUrlResponse(URL url, Proxy proxy, boolean isKeybase) throws IOException {
         OkHttpClient client;
 
-        try {
-            if (proxy != null) {
-                client = OkHttpClientFactory.getClientPinnedIfAvailable(url, proxy);
-            } else {
-                client = OkHttpClientFactory.getSimpleClient();
-            }
-        } catch (TlsCertificatePinning.TlsCertificatePinningException e) {
-            Log.e(Constants.TAG, "TlsHelper failed", e);
-            throw new IOException("TlsHelper failed");
+        if (proxy != null) {
+            client = OkHttpClientFactory.getClientPinnedIfAvailable(url, proxy);
+        } else {
+            client = OkHttpClientFactory.getSimpleClient();
         }
 
         Request request = new Request.Builder()
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
index 932a436da..f50b22d37 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
@@ -18,6 +18,11 @@
 package org.sufficientlysecure.keychain.ui.dialog;
 
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -44,23 +49,17 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.ParcelableHkpKeyserver;
-import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.network.OkHttpClientFactory;
-import org.sufficientlysecure.keychain.util.ParcelableProxy;
-import org.sufficientlysecure.keychain.util.Preferences;
 import org.sufficientlysecure.keychain.network.TlsCertificatePinning;
 import org.sufficientlysecure.keychain.network.orbot.OrbotHelper;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.ParcelableProxy;
+import org.sufficientlysecure.keychain.util.Preferences;
 
 public class AddEditKeyserverDialogFragment extends DialogFragment implements OnEditorActionListener {
     private static final String ARG_MESSENGER = "arg_messenger";
@@ -385,8 +384,6 @@ public class AddEditKeyserverDialogFragment extends DialogFragment implements On
                         keyserverUriOnion.toURL(), proxy.getProxy());
                 clientTor.newCall(new Request.Builder().url(keyserverUriOnion.toURL()).build()).execute();
             }
-        } catch (TlsCertificatePinning.TlsCertificatePinningException e) {
-            reason = VerifyReturn.CONNECTION_FAILED;
         } catch (MalformedURLException | URISyntaxException e) {
             Log.w(Constants.TAG, "Invalid keyserver URL entered by user.");
             reason = VerifyReturn.INVALID_URL;