diff --git a/akka-actor-tests/src/test/scala/akka/actor/actor/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/actor/LoggingReceiveSpec.scala
index 5c91dd5601..07ff9ba39c 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/actor/LoggingReceiveSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/actor/LoggingReceiveSpec.scala
@@ -90,7 +90,7 @@ class LoggingReceiveSpec
       actor ! "bah"
       within(300 millis) {
         expectMsgPF() {
-          case EventHandler.Error(ex: UnhandledMessageException, ref, "bah") if ref eq actor ⇒ true
+          case EventHandler.Error(ex: UnhandledMessageException, ref, exMsg) if ref eq actor ⇒ true
         }
       }
       actor.stop()
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index aa3ac1d7d0..557985ddde 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -779,7 +779,7 @@ class LocalActorRef private[akka] (private[this] val props: Props, val address:
           }
         } catch {
           case e ⇒
-            EventHandler.error(e, actorInstance.get(), messageHandle.message.toString)
+            EventHandler.error(e, actorInstance.get(), e.getMessage)
             throw e
         }
       } else {
@@ -959,7 +959,7 @@ class LocalActorRef private[akka] (private[this] val props: Props, val address:
   }
 
   private def handleExceptionInDispatch(reason: Throwable, message: Any) {
-    EventHandler.error(reason, this, message.toString)
+    EventHandler.error(reason, this, reason.getMessage)
 
     //Prevent any further messages to be processed until the actor has been restarted
     dispatcher.suspend(this)