1 files changed, 4 insertions, 2 deletions
diff --git a/includes/model/Message_model.php b/includes/model/Message_model.php
index 9bd7d6ef..3f66f74a 100644
--- a/includes/model/Message_model.php
+++ b/includes/model/Message_model.php
@@ -16,11 +16,13 @@ function Message_ids()
  * Returns message by id.
  *
  * @param int $message_id message ID
- * @return array
+ * @return array|null
  */
 function Message($message_id)
 {
-    return DB::selectOne('SELECT * FROM `Messages` WHERE `id`=? LIMIT 1', [$message_id]);
+    $message = DB::selectOne('SELECT * FROM `Messages` WHERE `id`=? LIMIT 1', [$message_id]);
+
+    return empty($message) ? null : $message;
 }
 
 /**