diff --git a/src/ServicePulse.Host/app/js/directives/moment.js b/src/ServicePulse.Host/app/js/directives/moment.js
index 9fecef73d7..d5952c751c 100644
--- a/src/ServicePulse.Host/app/js/directives/moment.js
+++ b/src/ServicePulse.Host/app/js/directives/moment.js
@@ -5,15 +5,18 @@ angular.module('directives.moment', [])
         return {
             restrict: 'E',
             link: function(scope, element, attrs) {
+                var minDate = "0001-01-01T00:00:00";
                 var timeoutId = null;
                 var m;
                 
                 attrs.$observe('date', function (value) {
-                    if (value) {
+                    if (value && attrs.date !== minDate) {
                         m = moment(attrs.date);
                         element.attr('title', m.format('LLLL'));
                         updateText();
                         updateLoop();
+                    } else {
+                        element.text('TimeSent value unknown');
                     }
                 });
 
diff --git a/src/ServicePulse.Host/app/js/failed_messages/failedMessages.tpl.html b/src/ServicePulse.Host/app/js/failed_messages/failedMessages.tpl.html
index 35c7b5664d..88c6392c00 100644
--- a/src/ServicePulse.Host/app/js/failed_messages/failedMessages.tpl.html
+++ b/src/ServicePulse.Host/app/js/failed_messages/failedMessages.tpl.html
@@ -108,7 +108,7 @@ <h2 class="failedMessages-header"><i class="fa fa-envelope"></i><span class="bre
                                         <a eat-click tooltip="This only works if ServiceInsight is installed." class="btn btn-small btn-link" ng-click="debugInServiceInsight($index)"><i class="icon-service-insight"></i> Open in ServiceInsight</a>
                                     </div>
                                     <div class=" row-fluid">
-                                        <div class="span10 rowText" title="Message Type: {{row.message_type}}">{{row.message_type | limitTo: 90}}<span ng-show="row.message_type.length > 90">...</span></div>
+                                        <div class="span10 rowText" title="Message Type: {{row.message_type}}">{{row.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes' | limitTo: 90}}<span ng-show="row.message_type.length > 90">...</span></div>
                                         <div class="span2 text-right"><sp-moment date="{{row.time_sent}}" /></div>
                                     </div>
                                     <div class="row-fluid">