diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 9b3351f73..d8a5632bc 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -549,8 +549,8 @@ public class CallActivity extends AppCompatActivity {
         Set<String> oldSesssions = new HashSet<>();
 
         for (HashMap<String, String> participant : users) {
-            Object inCallObject = participant.get("inCall");
             if (!participant.get("sessionId").equals(callSession)) {
+                Object inCallObject = participant.get("inCall");
                 if ((boolean) inCallObject) {
                     newSessions.add(participant.get("sessionId"));
                 } else {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index 24cbd412a..38b10362e 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -381,12 +381,16 @@ public class SettingsController extends BaseController {
                         @Override
                         public void onAnimationEnd(Animator animation) {
                             super.onAnimationEnd(animation);
-                            messageView.setVisibility(View.GONE);
+                            if (messageView != null) {
+                                messageView.setVisibility(View.GONE);
+                            }
                         }
                     });
 
         } else {
-            messageView.setVisibility(View.GONE);
+            if (messageView != null) {
+                messageView.setVisibility(View.GONE);
+            }
         }
     }