diff --git a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
index 6c9c7a50cf..cf3764346f 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
@@ -339,9 +339,7 @@ class Index[K <: AnyRef, V <: AnyRef: Manifest] {
    */
   def foreach(fun: (K, V) ⇒ Unit) {
     import scala.collection.JavaConversions._
-    container.entrySet foreach { (e) ⇒
-      e.getValue.foreach(fun(e.getKey, _))
-    }
+    container.entrySet foreach { e ⇒ e.getValue.foreach(fun(e.getKey, _)) }
   }
 
   /**
diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index 22c3b46c52..0c87581e5e 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -22,13 +22,8 @@ final case class MessageInvocation(receiver: ActorRef,
                                    senderFuture: Option[Promise[Any]]) {
   if (receiver eq null) throw new IllegalArgumentException("Receiver can't be null")
 
-  def invoke() {
-    try {
-      receiver.invoke(this)
-    } catch {
-      case e: NullPointerException ⇒ throw new ActorInitializationException(
-        "Don't call 'self ! message' in the Actor's constructor (in Scala this means in the body of the class).")
-    }
+  final def invoke() {
+    receiver invoke this
   }
 }
 
@@ -177,7 +172,7 @@ trait MessageDispatcher {
       val uuid = i.next()
       Actor.registry.local.actorFor(uuid) match {
         case Some(actor) ⇒ actor.stop()
-        case None        ⇒ {}
+        case None        ⇒
       }
     }
   }
diff --git a/akka-http/src/main/scala/akka/http/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala
index ae2648cea2..d5139795ba 100644
--- a/akka-http/src/main/scala/akka/http/Mist.scala
+++ b/akka-http/src/main/scala/akka/http/Mist.scala
@@ -137,12 +137,12 @@ trait Mist {
 trait RootEndpointLocator {
   var root: ActorRef = null
 
-  def configureRoot(id: String) {
-    def findRoot(id: String): ActorRef =
-      Actor.registry.actorFor(id).getOrElse(
-        throw new ConfigurationException("akka.http.root-actor-id configuration option does not have a valid actor address [" + id + "]"))
+  def configureRoot(address: String) {
+    def findRoot(address: String): ActorRef =
+      Actor.registry.actorFor(address).getOrElse(
+        throw new ConfigurationException("akka.http.root-actor-id configuration option does not have a valid actor address [" + address + "]"))
 
-    root = if ((id eq null) || id == "") findRoot(MistSettings.RootActorID) else findRoot(id)
+    root = if ((address eq null) || address == "") findRoot(MistSettings.RootActorID) else findRoot(address)
   }
 }
 
@@ -288,7 +288,7 @@ class RootEndpoint extends Actor with Endpoint {
 
   def recv: Receive = {
     case NoneAvailable(uri, req) ⇒ _na(uri, req)
-    case unknown                 ⇒ {}
+    case unknown                 ⇒
   }
 
   /**