diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java
index 2d476a336..8108dfa1d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/FacebookSignInHandler.java
@@ -12,7 +12,6 @@
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
 import com.facebook.FacebookRequestError;
-import com.facebook.FacebookSdk;
 import com.facebook.GraphRequest;
 import com.facebook.GraphResponse;
 import com.facebook.WebDialog;
@@ -43,13 +42,11 @@ public class FacebookSignInHandler extends ProviderSignInBase<AuthUI.IdpConfig>
     static {
         boolean available;
         try {
-            //noinspection unused to possibly throw
-            Class c = FacebookSdk.class;
+            Class.forName("com.facebook.login.LoginManager");
             available = true;
-        } catch (NoClassDefFoundError e) {
+        } catch (ClassNotFoundException e) {
             available = false;
         }
-        //noinspection ConstantConditions IntelliJ is wrong
         IS_AVAILABLE = available;
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/remote/TwitterSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/data/remote/TwitterSignInHandler.java
index 68647af6e..78b84f6bb 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/remote/TwitterSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/remote/TwitterSignInHandler.java
@@ -35,16 +35,13 @@ public class TwitterSignInHandler extends ProviderSignInBase<Void> {
     static {
         boolean available;
         try {
-            //noinspection unused to possibly throw
-            Class c = TwitterCore.class;
+            Class.forName("com.twitter.sdk.android.core.identity.TwitterAuthClient");
             available = true;
-        } catch (NoClassDefFoundError e) {
+        } catch (ClassNotFoundException e) {
             available = false;
         }
-        //noinspection ConstantConditions IntelliJ is wrong
         IS_AVAILABLE = available;
 
-        //noinspection ConstantConditions IntelliJ is still wrong
         if (IS_AVAILABLE) {
             Context context = AuthUI.getApplicationContext();
             Twitter.initialize(new TwitterConfig.Builder(context)