diff --git a/src/eng/generic-helpers.js b/src/eng/generic-helpers.js
index a5b1751..ab9947b 100644
--- a/src/eng/generic-helpers.js
+++ b/src/eng/generic-helpers.js
@@ -23,10 +23,17 @@ Generic template helper definitions for HackMyResume / FluentCV.
 
     /**
     Convert the input date to a specified format through Moment.js.
+    If date is invalid, will return the time provided by the user, 
+    or default to the fallback param or 'Present' if that is set to true
     @method formatDate
     */
-    formatDate: function(datetime, format) {
-      return moment ? moment( datetime ).format( format ) : datetime;
+    formatDate: function(datetime, format, fallback) {
+      if (moment) {
+        var momentDate = moment( datetime );
+        if (momentDate.isValid()) return momentDate.format(format);
+      }
+
+      return datetime || (typeof fallback == 'string' ? fallback : (fallback === true ? 'Present' : null));
     },
 
     /**