diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index a0d8ae137426cb956c00cfa971eff28431d91a8b..2a55fcd9a7c08eeabfc25496537163313a229a9a 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 %li.comment.posted{:data=>{:guid => comment.id}, :class => ("hidden" if(defined? hidden))}
-  - if current_user.owns?(comment) || current_user.owns?(comment.post)
+  - if current_user && current_user.owns?(comment) || current_user.owns?(comment.post)
     .right.controls
       = link_to image_tag('deletelabel.png'), comment_path(comment), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete comment_delete", :title => t('delete')
   = person_image_link(comment.author)
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index 46d8aa96591c6716ea017013df743ee6bc1d2bdc..20749786222f5cdcdc50dc3deab80e2f3fe8922a 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -41,14 +41,20 @@ describe TagsController do
         before do
           @post = @user.post(:status_message, :text => "#what", :public => true, :to => 'all')
           @user.post(:status_message, :text => "#hello", :public => true, :to => 'all')
-          get :show, :name => 'what'
         end
         it "succeeds" do
+          get :show, :name => 'what'
           response.should be_success
         end
         it "assigns the right set of posts" do
+          get :show, :name => 'what'
           assigns[:posts].should == [@post]
         end
+        it 'succeeds with comments' do
+          @user.comment('what WHAT!', :on => @post)
+          get :show, :name => 'what'
+          response.should be_success
+        end
       end
     end
   end