From 9050c8790ee0ca8cfd2b3a8c4cbe4d1863629f6d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 8 Jan 2016 09:56:06 +1100
Subject: [PATCH] Bug Fixes

---
 app/Libraries/Utils.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 74ac56169980..e60feff84e99 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -377,7 +377,10 @@ class Utils
         $format = Session::get(SESSION_DATE_FORMAT, DEFAULT_DATE_FORMAT);
         $dateTime = DateTime::createFromFormat($format, $date);
 
-        return $formatResult ? $dateTime->format('Y-m-d') : $dateTime;
+        if(!$dateTime)
+            return $date;
+        else
+            return $formatResult ? $dateTime->format('Y-m-d') : $dateTime;
     }
 
     public static function fromSqlDate($date, $formatResult = true)