2 files changed, 3 insertions, 3 deletions

diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/contents/ui/LogView.qml
index 918597df..b278c2e9 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/contents/ui/LogView.qml
@@ -122,8 +122,8 @@ Controls.SplitView {
         property date timestamp
         property string message
         property string resourceId: ""
-        property string accountId: retriever.currentData.accountId
-        property string accountName: retriever.currentData.name
+        property string accountId: retriever.currentData ? retriever.currentData.accountId : ""
+        property string accountName: retriever.currentData ? retriever.currentData.name : ""
         color: Kube.Colors.backgroundColor
 
         Kube.ModelIndexRetriever {
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index cbf754c3..65e1e863 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -450,7 +450,7 @@ Rectangle {
                             anchors.verticalCenter: parent.verticalCenter
                             color: styleData.textColor
                             elide: styleData.elideMode
-                            text: styleData.value
+                            text: styleData.value ? styleData.value : ""
                         }
                         MouseArea {
                             anchors.fill: parent