diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 07c434d..9e35abb 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -24,7 +24,7 @@
 </div>
  <div class="row-fluid">
 <%= calendar @calendar.calentries do |entry| %>
-  <div><%= link_to entry.name.to_s, polymorphic_path(entry.object) %></div>
+  <div><%= link_to entry.name.to_s, polymorphic_path(entry.try(:object)) unless entry.object.nil? %></div>
 <% end %>
 </div>
  <div class="row-fluid">
diff --git a/app/views/calentries/show.html.erb b/app/views/calentries/show.html.erb
index faa5c9c..08f9cc6 100644
--- a/app/views/calentries/show.html.erb
+++ b/app/views/calentries/show.html.erb
@@ -1,13 +1,24 @@
 <p id="notice"><%= notice %></p>
 <div class="container-fluid">
 <div class="row-fluid">
-<div class="span12">
+ <div class="span12">
   <b>
   <%= @calentry.summary %>
   </b>
 
 </div>
 </div>
+  <div><%= unless @calentry.object.nil? 
+link_to @calentry.name.to_s, polymorphic_path(@calentry.object) 
+else 
+@calentry.name.to_s
+end
+%></div>
+
+
+  <div><%= link_to @calentry.name.to_s, polymorphic_path(@calentry.object) 
+
+%></div>
 <div class="row-fluid">
 <div class="span9">
   <%= I18n.l @calentry.start %>
@@ -21,5 +32,5 @@
  <div class="row-fluid">
  <div class="span12">
 <%= link_to 'Edit', edit_calentry_path(@calentry) %> |
-<%= link_to 'Back', calentries_path %>
+<%= link_to 'Back', calendar_path(@calentry.calendar) %>
 </div></div></div>