diff --git a/linphone-app/ui/modules/Common/Form/ListForm.js b/linphone-app/ui/modules/Common/Form/ListForm.js
index e6676ef39..0d87e3872 100644
--- a/linphone-app/ui/modules/Common/Form/ListForm.js
+++ b/linphone-app/ui/modules/Common/Form/ListForm.js
@@ -29,9 +29,10 @@ function setData (data) {
   var model = values.model
 
   model.clear()
-  data.forEach(function (data) {
-    model.append({ $value: data, $isInvalid: false })
-  })
+  if(data)
+	data.forEach(function (data) {
+		model.append({ $value: data, $isInvalid: false })
+	})
 }
 
 function setInvalid (index, status) {
diff --git a/linphone-app/ui/views/App/Main/ContactEdit.js b/linphone-app/ui/views/App/Main/ContactEdit.js
index a863b8d37..11da59f9c 100644
--- a/linphone-app/ui/views/App/Main/ContactEdit.js
+++ b/linphone-app/ui/views/App/Main/ContactEdit.js
@@ -172,7 +172,7 @@ function handleUrlChanged () {
 // -----------------------------------------------------------------------------
 
 function buildAddressFields () {
-
+  if(!contactEdit._vcard) return []
   var address = contactEdit._vcard.address
 
   return [{
diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml
index 9e6ef4e53..83c6d2827 100644
--- a/linphone-app/ui/views/App/Main/ContactEdit.qml
+++ b/linphone-app/ui/views/App/Main/ContactEdit.qml
@@ -112,8 +112,8 @@ ColumnLayout  {
 					id: avatar
 					
 					anchors.fill: parent
-					image: _vcard.avatar
-					username: _vcard.username
+					image: _vcard ? _vcard.avatar : ''
+					username: _vcard ? _vcard.username : ''
 					presenceLevel: _contact ? _contact.presenceLevel : -1
 					visible: (isLoaded() && !parent.hovered) || !_edition
 				}
@@ -408,7 +408,7 @@ ColumnLayout  {
 					}
 					
 					TextButtonB {
-						enabled: usernameInput.text.length > 0 && _vcard.sipAddresses.length > 0
+						enabled: usernameInput.text.length > 0 && _vcard && _vcard.sipAddresses.length > 0
 						text: qsTr('save')
 						onClicked: Logic.save()
 					}