diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index acc882c4d..9b0b7b165 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -416,7 +416,7 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis
 				enterIncallMode(lc);
 			}
 		}else if (state==LinphoneCall.State.Error){
-			if (mCurrentCall==call){
+			if (lc.getCurrentCall()==call){
 				if (mWakeLock.isHeld()) mWakeLock.release();
 				showToast(R.string.call_error, message);
 				exitCallMode();
@@ -424,7 +424,7 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis
 				mCurrentCall=null;
 			}
 		}else if (state==LinphoneCall.State.CallEnd){
-			if (mCurrentCall==call){
+			if (lc.getCurrentCall() == null || lc.getCurrentCall()==call){
 				exitCallMode();
 				LinphoneActivity.instance().stopOrientationSensor();
 				mCurrentCall=null;