diff --git a/src/Modus/Template/Helper/Messages.php b/src/Modus/Template/Helper/Messages.php
index <HASH>..<HASH> 100644
--- a/src/Modus/Template/Helper/Messages.php
+++ b/src/Modus/Template/Helper/Messages.php
@@ -22,12 +22,16 @@ class Messages extends AbstractHelper {
 
     protected function getErrors() {
         $message = $this->segment->getFlash('failure');
-        return '<div class="failure">' . $message . '</div>';
+        if($message) {
+            return '<div class="failure">' . $message . '</div>';
+        }
 
     }
 
     protected function getMessages() {
         $message = $this->segment->getFlash('success');
-        return '<div class="success">' . $message . '</div>';
+        if($message) {
+            return '<div class="success">' . $message . '</div>';
+        }
     }
 }
\ No newline at end of file
Checking that a message exists before returning the HTML.