diff --git a/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
index 5b7d78a9cd87c41f54a609d611943e0de78dc83c..bbc52d5fb30e6f5b39023454f3c11062a756fe83 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
@@ -560,7 +560,7 @@ public class CallPresenter extends RootPresenter<CallView> {
     }
 
     public void toggleButtonClicked() {
-        if (!(mConference.isRinging() && mConference.isIncoming())) {
+        if (mConference != null && !(mConference.isRinging() && mConference.isIncoming())) {
             hangupCall();
         }
     }
diff --git a/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java
index 512e8fa1b9fa5303c1878b2d11ee7b2d95d30372..8a6bd3b28dc8df6a1a8e27114c0d4b66eb991b5d 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java
@@ -319,7 +319,7 @@ public class ConversationPresenter extends RootPresenter<ConversationView> {
     }
 
     public void clickOnGoingPane() {
-        Conference conf = mConversation.getCurrentCall();
+        Conference conf = mConversation == null ? null : mConversation.getCurrentCall();
         if (conf != null) {
             getView().goToCallActivity(conf.getId());
         } else {