1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
index 0708e27f1..77ee6e155 100644
--- a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
+++ b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
@@ -496,12 +496,14 @@ public class MessagesWWW {
             throw new HttpForbiddenException();
         }
 
-        com.juick.Message msg = messagesService.getMessage(mid);
+        Optional<com.juick.Message> message = messagesService.getMessage(mid);
 
-        if (msg == null || msg.getUser().isBanned()) {
+        if (!message.isPresent() || message.get().getUser().isBanned()) {
             throw new HttpNotFoundException();
         }
 
+        Message msg = message.get();
+
         com.juick.User user = userService.getUserByName(uname);
         if (user.isAnonymous() || !msg.getUser().equals(user)) {
             return String.format("redirect:/%s/%d", msg.getUser().getName(), mid);