diff --git a/src/conference/session/call-session.cpp b/src/conference/session/call-session.cpp
index 36519991b..b5d333881 100644
--- a/src/conference/session/call-session.cpp
+++ b/src/conference/session/call-session.cpp
@@ -1049,7 +1049,7 @@ LinphoneCallState CallSession::getState () const {
 
 string CallSession::getRemoteUserAgent () const {
 	L_D();
-	if (d->op)
+	if (d->op && d->op->get_remote_ua())
 		return d->op->get_remote_ua();
 	return string();
 }
diff --git a/src/conference/session/media-session.cpp b/src/conference/session/media-session.cpp
index 51f1225d2..e3a56d749 100644
--- a/src/conference/session/media-session.cpp
+++ b/src/conference/session/media-session.cpp
@@ -4317,7 +4317,7 @@ LinphoneStatus MediaSession::update (const MediaSessionParams *msp, const string
 	if (d->currentParams == msp)
 		lWarning() << "CallSession::update() is given the current params, this is probably not what you intend to do!";
 	d->iceAgent->checkSession(IR_Controlling, true);
-	if (d->params) {
+	if (msp) {
 #if 0
 		call->broken = FALSE;
 #endif