diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 2c466aba4f27692cc713a42ac4f12274449e60ef..0eb87caadd7572686977c436b96b2e8efa54d297 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,7 +1,7 @@
 module EventsHelper
   def link_to_author(event)
     project = event.project
-    tm = project.team_member_by_id(event.author_id)
+    tm = project.team_member_by_id(event.author_id) if project
 
     if tm
       link_to event.author_name, project_team_member_path(project, tm)
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index ffcaa81a9d888cfc12617cf0dfd399c35ed4bff6..dcabd1a95ee02a1f082ecd4e37d6421ed00fa34a 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -1,7 +1,13 @@
 .event-title
   %span.author_name= link_to_author event
   %span.event_label{class: event.action_name}= event_action_name(event)
-  = link_to [event.project, event.target] do
+  - if event.target
+    = link_to [event.project, event.target] do
+      %strong= truncate event.target_title
+  - else
     %strong= truncate event.target_title
   at
-  = link_to_project event.project
+  - if event.project
+    = link_to_project event.project
+  - else
+    = event.project_name