diff --git a/app/models/story.rb b/app/models/story.rb
index f532b1a..e3975ed 100644
--- a/app/models/story.rb
+++ b/app/models/story.rb
@@ -166,7 +166,8 @@ class Story < ActiveRecord::Base
   def check_tags
     (self.tags_to_add || []).each do |t|
       if !t.valid_for?(self.user)
-        raise "#{self.user.username} does not have permissions to use privileged tags"
+        raise "#{self.user.username} does not have permission to use " <<
+          "privileged tag #{t.tag}"
       end
     end
   end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 3484563..9fb6b31 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,13 +1,8 @@
 class Tag < ActiveRecord::Base
   attr_accessor :filtered_count
 
-  # Scope to determine what tags a user can see
   scope :accessible_to, ->(user) do
-    if user.is_admin?
-      all
-    else
-      where(:privileged => false)
-    end
+    user.is_admin?? all : where(:privileged => false)
   end
 
   def self.all_with_filtered_counts_for(user)