diff --git a/smsapp/qml/ConversationDisplay.qml b/smsapp/qml/ConversationDisplay.qml
index a1445d5f..74aa5a22 100644
--- a/smsapp/qml/ConversationDisplay.qml
+++ b/smsapp/qml/ConversationDisplay.qml
@@ -1,73 +1,73 @@
 /*
  * This file is part of KDE Telepathy Chat
  *
  * Copyright (C) 2015 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 import QtQuick 2.1
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import org.kde.people 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import org.kde.kdeconnect.sms 1.0
 
 Kirigami.ScrollablePage
 {
     id: page
     property alias personUri: person.personUri
     readonly property QtObject person: PersonData {
         id: person
     }
     property QtObject device
     property string conversationId
 
     property string phoneNumber
-    title: person ? i18n("%1: %2", person.name, phoneNumber) : phoneNumber
+    title: person && person.name ? i18n("%1: %2", person.name, phoneNumber) : phoneNumber
 
     ListView {
         model: ConversationModel {
             id: model
             deviceId: device.id()
             threadId: page.conversationId
         }
 
         delegate: Kirigami.BasicListItem {
             readonly property real margin: 100
             x: fromMe ? Kirigami.Units.gridUnit : margin
             width: parent.width - margin - Kirigami.Units.gridUnit
             contentItem: Label { text: model.display }
         }
     }
     footer: RowLayout {
         enabled: page.device
         TextField {
             id: message
             Layout.fillWidth: true
             placeholderText: i18n("Say hi...")
             onAccepted: {
                 console.log("sending sms", page.phoneNumber)
                 model.sendReplyToConversation(message.text)
             }
         }
         Button {
             text: "Send"
             onClicked: {
                 message.accepted()
             }
         }
     }
 }