diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandAlertRaw.java b/proxy/src/main/java/net/md_5/bungee/command/CommandAlertRaw.java
index 0c9ac0e5..f1c66936 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandAlertRaw.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandAlertRaw.java
@@ -1,16 +1,15 @@
 package net.md_5.bungee.command;
 
-import com.google.common.base.Joiner;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.chat.ComponentSerializer;
 
-import java.util.Arrays;
+import com.google.common.base.Joiner;
 
 public class CommandAlertRaw extends Command
 {
@@ -35,12 +34,23 @@ public class CommandAlertRaw extends Command
                 ProxyServer.getInstance().broadcast( ComponentSerializer.parse( message ) );
             } catch ( Exception e )
             {
-                sender.sendMessage(
-                        new ComponentBuilder( "An error occurred while parsing your message. (Hover for details)" ).
-                                color( ChatColor.RED ).underlined( true ).
-                                event( new HoverEvent( HoverEvent.Action.SHOW_TEXT,
-                                        new ComponentBuilder( e.getMessage() ).color( ChatColor.RED ).create() ) ).
-                                create() );
+            	Throwable error = e;
+            	while ( error.getCause() != null )
+            	{
+            	    error = error.getCause();
+            	}
+            	if ( sender instanceof ProxiedPlayer )
+            	{
+	                sender.sendMessage(
+	                        new ComponentBuilder( "An error occurred while parsing your message. (Hover for details)" ).
+	                                color( ChatColor.RED ).underlined( true ).
+	                                event( new HoverEvent( HoverEvent.Action.SHOW_TEXT,
+	                                        new ComponentBuilder( error.getMessage() ).color( ChatColor.RED ).create() ) ).
+	                                create() );
+            	} else
+            	{
+            		sender.sendMessage(new ComponentBuilder( "An error occurred while parsing your message: " ).color( ChatColor.RED ).append( error.getMessage() ).create() );
+            	}
             }
         }
     }