diff --git a/linphone-app/src/components/chat-room/ChatRoomModel.cpp b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
index 74de4fc8e..22e7c2efc 100644
--- a/linphone-app/src/components/chat-room/ChatRoomModel.cpp
+++ b/linphone-app/src/components/chat-room/ChatRoomModel.cpp
@@ -368,7 +368,7 @@ void ChatRoomModel::emitFullPeerAddressChanged(){
 //--------------------------------------------------------------------------------------------
 
 QString ChatRoomModel::getPeerAddress () const {
-	return mChatRoom ? Utils::coreStringToAppString(mChatRoom->getPeerAddress()->asStringUriOnly()) : "";
+	return mChatRoom && mChatRoom->getPeerAddress() ? Utils::coreStringToAppString(mChatRoom->getPeerAddress()->asStringUriOnly()) : "";
 }
 
 QString ChatRoomModel::getLocalAddress () const {
@@ -430,7 +430,15 @@ QString ChatRoomModel::getUsername () const {
 	username = Utils::getDisplayName(mChatRoom->getPeerAddress());
 	if(username != "")
 		return username;
-	return Utils::coreStringToAppString(mChatRoom->getPeerAddress()->asStringUriOnly());
+	auto addr = mChatRoom->getPeerAddress();
+	if( addr)
+		return Utils::coreStringToAppString(addr->asStringUriOnly());
+	else {
+		qWarning() << "ChatRoom has no peer address or address is invalid : Subject=" << mChatRoom->getSubject().c_str() 
+			<< ", created at " << QDateTime::fromSecsSinceEpoch(mChatRoom->getCreationTime())
+			<< " (" << mChatRoom.get() << ")";
+		return "";
+	}
 }
 
 QString ChatRoomModel::getAvatar () const {
@@ -547,11 +555,15 @@ QString ChatRoomModel::getParticipantAddress(){
 			if( conferenceAddress)
 				return Utils::coreStringToAppString(conferenceAddress->asString());
 			else{
-				qWarning() << "ConferenceAddress is NULL when requesting it from not secure and conference ChatRoomModel :" << mChatRoom.get();
+				qWarning() << "ConferenceAddress is NULL when requesting it from not secure and conference ChatRoomModel. Subject=" << mChatRoom->getSubject().c_str() 
+					<< ", created at " << QDateTime::fromSecsSinceEpoch(mChatRoom->getCreationTime())
+					<< " (" << mChatRoom.get() << ")";
 				return "";
 			}
 		}else {
-			qWarning() << "PeerAddress is NULL when requesting it from not secure ChatRoomModel :" << mChatRoom.get();
+			qWarning() << "PeerAddress is NULL when requesting it from not secure ChatRoomModel. Subject=" << mChatRoom->getSubject().c_str()
+				<< ", created at " << QDateTime::fromSecsSinceEpoch(mChatRoom->getCreationTime())
+				<< " (" << mChatRoom.get() << ")";
 			return "";
 		}
 	}else{
diff --git a/linphone-sdk b/linphone-sdk
index b9c4a6d46..2b0c68e42 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit b9c4a6d464bcead4ad40aa652933d84c29a4194b
+Subproject commit 2b0c68e4234dd35dd99fdea96eed71f4a394008f