diff --git a/akka-actor/src/main/scala/actor/ActorRegistry.scala b/akka-actor/src/main/scala/actor/ActorRegistry.scala
index e8c38f2b76..f340533186 100644
--- a/akka-actor/src/main/scala/actor/ActorRegistry.scala
+++ b/akka-actor/src/main/scala/actor/ActorRegistry.scala
@@ -109,18 +109,15 @@ object ActorRegistry extends ListenerManagement {
    * Finds all actors that has a specific id.
    */
   def actorsFor(id: String): Array[ActorRef] = {
-    if (actorsById.containsKey(id)) {
-      actorsById.get(id).toArray(Naught)
-    } else Naught
+    val set = actorsById get id
+    if (set ne null) set toArray Naught
+    else Naught
   }
 
    /**
    * Finds the actor that has a specific UUID.
    */
-  def actorFor(uuid: String): Option[ActorRef] = {
-    if (actorsByUUID.containsKey(uuid)) Some(actorsByUUID.get(uuid))
-    else None
-  }
+  def actorFor(uuid: String): Option[ActorRef] = Option(actorsByUUID get uuid)
 
   /**
    * Registers an actor in the ActorRegistry.