diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
index 521a9024ce..87e65002fe 100644
--- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
@@ -50,7 +50,7 @@ object FaultHandlingStrategy {
   case object Restart extends Action
   case object Stop extends Action
   case object Escalate extends Action
-  
+
   // Java API
   def resume = Resume
   def restart = Restart
diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala
index 3572875860..3ab628a559 100644
--- a/akka-remote/src/main/scala/akka/remote/Remote.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remote.scala
@@ -157,8 +157,8 @@ class RemoteSystemDaemon(remote: Remote, _path: ActorPath, _parent: InternalActo
       import remote.remoteAddress
 
       message.getActorPath match {
-        case RemoteActorPath(`remoteAddress`, elems) if elems.size > 0 && elems.head == "remote" ⇒
-          // TODO RK canonicalize path so as not to duplicate it always
+        case RemoteActorPath(`remoteAddress`, elems) if elems.nonEmpty && elems.head == "remote" ⇒
+          // TODO RK canonicalize path so as not to duplicate it always #1446
           val subpath = elems.drop(1)
           val path = remote.remoteDaemon.path / subpath
           val supervisor = remote.system.actorFor(message.getSupervisor).asInstanceOf[InternalActorRef]