From c74137e679a226c70f013e8f0a47b18629222173 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will.rossiter@gmail.com>
Date: Fri, 28 Feb 2014 21:24:09 +1300
Subject: [PATCH] FIX: getMessageFromSession returning null on first access

---
 forms/Form.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forms/Form.php b/forms/Form.php
index edd318176..ca38874eb 100644
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -1016,12 +1016,17 @@ class Form extends RequestHandler {
 		return $this->messageType;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getMessageFromSession() {
 		if($this->message || $this->messageType) {
 			return $this->message;
-		}else{
+		} else {
 			$this->message = Session::get("FormInfo.{$this->FormName()}.formError.message");
 			$this->messageType = Session::get("FormInfo.{$this->FormName()}.formError.type");
+
+			return $this->message;
 		}
 	}