diff --git a/chatto/pom.xml b/chatto/pom.xml
index 03597f1..caa7430 100644
--- a/chatto/pom.xml
+++ b/chatto/pom.xml
@@ -152,7 +152,6 @@
             <configuration>
               <arguments>${gruntArg}</arguments>
             </configuration>
-            <!-- <phase>package</phase> -->
           </execution>
         </executions>
       </plugin>
diff --git a/chatto/src/main/javascript/ts/src/main.ts b/chatto/src/main/javascript/ts/src/main.ts
index 0e99e12..d9b0469 100644
--- a/chatto/src/main/javascript/ts/src/main.ts
+++ b/chatto/src/main/javascript/ts/src/main.ts
@@ -79,10 +79,12 @@ Handlebars.registerHelper('avatar', function () {
     return '<div class="img_cont_msg"> <img src="https://static.turbosquid.com/Preview/001292/481/WV/_D.jpg" class="rounded-circle user_img_msg"> </div>';
 });
 Handlebars.registerHelper('fromNow', function (date: string) {
+    if(date == null)
+    return ": Never"
     return moment(date).fromNow();
 })
-Handlebars.registerHelper('msgDateFormat', function(date: string) {
-    return moment(date).calendar(moment.now(), {lastWeek: "DD/MM/YY hh:mm:a", sameElse: "DD/MM/YY hh:mm:a"})
+Handlebars.registerHelper('msgDateFormat', function (date: string) {
+    return moment(date).calendar(moment.now(), { lastWeek: "DD/MM/YY hh:mm A", sameElse: "DD/MM/YY hh:mm A" })
 })
 
 
diff --git a/chatto/src/main/javascript/ts/src/model/UserModel.ts b/chatto/src/main/javascript/ts/src/model/UserModel.ts
index 5bb1074..964e9d3 100644
--- a/chatto/src/main/javascript/ts/src/model/UserModel.ts
+++ b/chatto/src/main/javascript/ts/src/model/UserModel.ts
@@ -76,6 +76,9 @@ export class UserModel implements Subject<ActiveUserViewModel> {
                     // log.trace(sessionStorage.getItem('activeUsers'));
                     log.info(`Subject: received ajax active users`);
                     data.map((d: any) => {
+                        if( d.lastActive == null )
+                            return null;
+
                         d.lastActive = new Date(d.lastActive)
                         return d;
                     });