1 files changed, 4 insertions, 1 deletions

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 7433d21..c965443 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -7,9 +7,12 @@ class TagsController < ApplicationController
 
   def show
     @tag    = Tag.find_by_name(params[:id])
+    
+    tag_name = @tag ? @tag.name : nil
+    
     @page   = Page.new
     @pages  = Page.heads.find_tagged_with(
-                @tag.name, :order => 'published_at DESC'
+                tag_name, :order => 'published_at DESC'
               ).paginate(
                 :page=>params[:page],
                 :per_page => 23