diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 660e71ce..383ab080 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -39,13 +39,13 @@ class NotificationService
 
   def self.text_for_notification(notification)
     if notification.notification_code == MAILBOXER_CODE_ACCESS_REQUEST
-      map = notification.notified_object&.map
+      map = notification.notified_object.map
       'wants permission to map with you on <span class="in-bold">' + map.name + '</span>&nbsp;&nbsp;<div class="action">Offer a response</div>'
     elsif notification.notification_code == MAILBOXER_CODE_ACCESS_APPROVED
-      map = notification.notified_object&.map
+      map = notification.notified_object.map
       'granted your request to edit map <span class="in-bold">' + map.name + '</span>'
     elsif notification.notification_code == MAILBOXER_CODE_INVITE_TO_EDIT
-      map = notification.notified_object&.map
+      map = notification.notified_object.map
       'gave you edit access to map  <span class="in-bold">' + map.name + '</span>'
     elsif notification.notification_code == MAILBOXER_CODE_MESSAGE_FROM_DEVS
       notification.subject
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 6f66eccd..f27c1fef 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -7,7 +7,8 @@
       <h2 class="title">Notifications</h4>
     </header>
     <ul class="notifications">
-      <% @notifications.each do |notification| %>
+      <% notifications = @notifications.to_a.delete_if{|n| n.notified_object.nil? || n.notified_object.map.nil? }%> 
+      <% notifications.each do |notification| %>
         <% receipt = @receipts.find_by(notification_id: notification.id) %>
         <li class="notification <%= receipt.is_read? ? 'read' : 'unread' %>" id="notification-<%= notification.id %>">
           <%= link_to notification_path(notification.id) do %>
@@ -32,7 +33,7 @@
           <div class="clearfloat"></div>
         </li>
       <% end %>
-      <% if @notifications.count == 0 %>
+      <% if notifications.count == 0 %>
         <div class="emptyInbox">
           You have no notifications. More time for dancing.
         </div>