diff --git a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
index 15451ea..0304528 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
@@ -79,10 +79,12 @@ internal class ListMessageAdapter(
             holder.message.text = message.message.message
         }
         holder.title.text = message.message.title
-        picasso.load(Utils.resolveAbsoluteUrl("${settings.url}/", message.image))
-            .error(R.drawable.ic_alarm)
-            .placeholder(R.drawable.ic_placeholder)
-            .into(holder.image)
+        if (message.image != null) {
+            picasso.load(Utils.resolveAbsoluteUrl("${settings.url}/", message.image))
+                .error(R.drawable.ic_alarm)
+                .placeholder(R.drawable.ic_placeholder)
+                .into(holder.image)
+        }
 
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)
         val timeFormat = prefs.getString(timeFormatPrefsKey, timeFormatRelative)
diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt
index 7095aec..b5d2750 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt
@@ -6,14 +6,7 @@ import com.github.gotify.client.model.Message
 internal object MessageImageCombiner {
     fun combine(messages: List<Message>, applications: List<Application>): List<MessageWithImage> {
         val appIdToImage = appIdToImage(applications)
-        val result = mutableListOf<MessageWithImage>()
-        messages.forEach {
-            val messageWithImage = MessageWithImage()
-            messageWithImage.message = it
-            messageWithImage.image = appIdToImage[it.appid]!!
-            result.add(messageWithImage)
-        }
-        return result
+        return messages.map { MessageWithImage(message = it, image = appIdToImage[it.appid]) }
     }
 
     fun appIdToImage(applications: List<Application>): Map<Long, String> {
diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
index e99f730..9d1c293 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
@@ -2,7 +2,7 @@ package com.github.gotify.messages.provider
 
 import com.github.gotify.client.model.Message
 
-internal class MessageWithImage {
-    lateinit var message: Message
-    lateinit var image: String
-}
+internal data class MessageWithImage(
+    val message: Message,
+    val image: String?
+)