diff --git a/build.gradle b/build.gradle
index 3c72fbc45a..a6e6ef6a7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,6 @@ apply plugin: 'checkstyle'
 apply plugin: 'pmd'
 apply plugin: 'findbugs'
 
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-}
-
 ext {
     supportLibraryVersion = '24.2.1'
 
diff --git a/src/com/owncloud/android/ui/adapter/UserInfoAdapter.java b/src/com/owncloud/android/ui/adapter/UserInfoAdapter.java
index 9ad01d8c24..c72fb90792 100644
--- a/src/com/owncloud/android/ui/adapter/UserInfoAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/UserInfoAdapter.java
@@ -129,9 +129,10 @@ public class UserInfoAdapter extends RecyclerView.Adapter<UserInfoAdapter.ViewHo
             stringPairs.add(new StringPair(context.getResources().getString(R.string.user_info_website),
                     userInfo.getWebpage()));
 
-        if (!TextUtils.isEmpty(userInfo.getTwitter()) && context != null) {
-            stringPairs.add(new StringPair(context.getResources().getString(R.string.user_info_twitter),
-                    userInfo.getTwitter()));
+            if (!TextUtils.isEmpty(userInfo.getTwitter())) {
+                stringPairs.add(new StringPair(context.getResources().getString(R.string.user_info_twitter),
+                        userInfo.getTwitter()));
+            }
         }
     }