Handle user requesting a message with id that doesn't exist

src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java

@@ -226,7 +226,11 @@ public class MessageController extends HttpServlet {
                 request.setAttribute("allCropCategoryIds", em.createNamedQuery("CropCategory.findByOrganizationId").setParameter("organizationId",user.getOrganizationId().getOrganizationId()).getResultList());
                 request.getRequestDispatcher("/messageForm.ftl").forward(request, response);
             }
-            catch(NullPointerException | NumberFormatException | NoResultException ex)
+            catch(NoResultException ex)
+            {
+                response.sendError(404, "Message not found");
+            }
+            catch(NullPointerException | NumberFormatException ex)
             {
                 response.sendError(500, ExceptionUtil.getStackTrace(ex));
             }

src/main/java/no/nibio/vips/logic/service/LogicService.java

@@ -976,8 +976,11 @@ public class LogicService {
     public Response getMessage(@PathParam("messageId") Integer messageId)
     {
         Message message = messageBean.getMessage(messageId);
-        
-        return Response.ok().entity(message).build();
+        if(message != null)
+        {
+            return Response.ok().entity(message).build();
+        }
+        return Response.status(Status.NOT_FOUND).build();
     }
     
     /**