diff --git a/app/build.gradle b/app/build.gradle
index a9c79e8a6..bba6fd025 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,8 +56,8 @@ allprojects {
 }
 ext.supportLibraryVersion = '28.0.0'
 ext.glideLibraryVersion = '4.8.0'
-ext.conscryptLibraryVersion = '2.0.0'
-ext.evernoteLibraryVersion = '1.2.6'
+ext.conscryptLibraryVersion = '2.1.0'
+ext.evernoteLibraryVersion = '1.3.0-rc1'
 ext.gsonLibraryVersion = '2.8.2'
 ext.guavaLibraryVersion = '24.1-android'
 ext.photoViewLibraryVersion = '2.1.3'
diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
index add1e55db..2f9a1085a 100644
--- a/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
@@ -133,6 +133,10 @@ public class InstanceActivity extends BaseActivity implements OnRetrieveInstance
             return;
         }
         final Instance instance = apiResponse.getInstance();
+        if( instance == null){
+            Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
+            return;
+        }
         TextView instance_title = findViewById(R.id.instance_title);
         TextView instance_description = findViewById(R.id.instance_description);
         TextView instance_version = findViewById(R.id.instance_version);
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
index 6295b3ffb..bb7ccdbc9 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
@@ -151,7 +151,7 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
 
 
     public void scrollToTop(){
-        if( lv_search_tags != null) {
+        if( lv_search_tags != null && searchTagsAdapter != null) {
             lv_search_tags.setAdapter(searchTagsAdapter);
         }
     }