diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index a478cbe3b..38b8ac85c 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -70,14 +70,13 @@
                                              :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
 	         <% end %>
-            <% when '5' %>
-          <% if Forum.find(obj.id) %>
-	          <% if Forum.find(obj.id).creator_id == User.current.id %>
+         <% when '5' %>
+           <%  test = Forum.find(obj.id)    %>
+           <% if test && test.creator_id == User.current.id %>
 	         <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                             :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
-	         <% end %>
-                   <% end %>
+           <% end %>
 	    <% when '6' %>
 		    <%# if (User.current.logged? &&
                     User.current.admin?