diff --git a/lib/aethyr/core/commands/emote.rb b/lib/aethyr/core/commands/emote.rb
index 9f86d36069b99a9abad18a3310e4a8bf944937a4..d4d58bea59986dda66daefc78ab13ac5d54fe68e 100644
--- a/lib/aethyr/core/commands/emote.rb
+++ b/lib/aethyr/core/commands/emote.rb
@@ -58,7 +58,7 @@ EOF
 
               people.each do |person|
                 out = action.gsub(person.name, 'you')
-                person.output("#{player.name} #{out}") unless person.can? :blind and person.blind?
+                person.output("#{player.name} #{out}", message_type = :chat) unless person.can? :blind and person.blind?
               end
 
               room.output("#{player.name} #{action}", player, *people)
@@ -68,8 +68,9 @@ EOF
             end
 
             if show
-              event.to_player = "You emote: #{show}"
-              event.to_other = show
+              event[:message_type] = :chat
+              event[:to_player] = "You emote: #{show}"
+              event[:to_other] = show
               room.out_event event
             end
           end
diff --git a/lib/aethyr/core/commands/emote_handler.rb b/lib/aethyr/core/commands/emote_handler.rb
index 1893a025b250de1dad970a3b18fcc5c9c169f1f5..e3fdfaa693c5d32b7714c5497ef74bdea1dc85fe 100644
--- a/lib/aethyr/core/commands/emote_handler.rb
+++ b/lib/aethyr/core/commands/emote_handler.rb
@@ -13,7 +13,7 @@ module Aethyr
       def make_emote event, player, room, &block
         g = GenericEmote.new(event, player, room)
         g.instance_eval(&block)
-        if g.return_event
+        if g.return_event && (g.return_event.respond_to? :has_key?)
           g.set_post #add postfix
           log "Doing event" , Logger::Ultimate
           room.out_event g.return_event
@@ -28,6 +28,8 @@ module Aethyr
 
         def initialize(event, player, room)
           @event = event
+          @event[:message_type] = :chat
+          @event[:player] = player
           @player = player
           @room = room
           @post = event[:post]
diff --git a/lib/aethyr/core/objects/container.rb b/lib/aethyr/core/objects/container.rb
index 221beb72a6b616619440f3f71bda9a764cbe733d..fbe8c047ddcaceb5284f8c783bf00436fcf9d74e 100644
--- a/lib/aethyr/core/objects/container.rb
+++ b/lib/aethyr/core/objects/container.rb
@@ -84,12 +84,12 @@ class GridContainer < Container
     @inventory.add(object, position)
     object.container = @game_object_id
   end
-  
+
   def find_by_position(position)
     @inventory.find_by_position(position)
   end
-  
+
   def position game_object
     @inventory.position(game_object)
   end
-end
\ No newline at end of file
+end