diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index f5cf778793..36782d9712 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -75,10 +75,10 @@ abstract class MessageDispatcher extends Serializable {
   final def attach(actor: ActorInstance) {
     guard withGuard {
       register(actor)
-    }
-    val promise = new ActorPromise(Timeout.never)(this)
-    dispatchMessage(new MessageInvocation(actor, Init, promise))
-    promise.get
+      val promise = new ActorPromise(Timeout.never)(this)
+      dispatchMessage(new MessageInvocation(actor, Init, promise))
+      promise
+    }.get
   }
 
   /**