diff --git a/app/models/message.rb b/app/models/message.rb
index 7894ae9..12aaaba 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -4,7 +4,10 @@ class Message < ActiveRecord::Base
   validates_presence_of :creator_id, :receiver_id, :message
 
   def creator_name
-    creator = User.where(:id => self.creator_id).first
-    creator.full_name
+    if creator = User.where(:user_id => self.creator_id).first
+      creator.full_name
+    else
+      "<b>Name unavailable</b>".html_safe
+    end
   end
-end
\ No newline at end of file
+end