diff --git a/akka-core/src/main/scala/actor/Fsm.scala b/akka-core/src/main/scala/actor/Fsm.scala
index a36eca3be9..f82a1c8035 100644
--- a/akka-core/src/main/scala/actor/Fsm.scala
+++ b/akka-core/src/main/scala/actor/Fsm.scala
@@ -32,6 +32,7 @@ trait Fsm[S] { self: Actor =>
 
       currentState match {
         case State(Reply, _, _, _, reply) => reply.foreach(this.self.reply)
+        case _ => () // ignore for now
       }
     }
   }
diff --git a/akka-core/src/test/scala/FsmActorSpec.scala b/akka-core/src/test/scala/FsmActorSpec.scala
index 1742dc8bad..bca358b2e1 100644
--- a/akka-core/src/test/scala/FsmActorSpec.scala
+++ b/akka-core/src/test/scala/FsmActorSpec.scala
@@ -17,7 +17,7 @@ object FsmActorSpec {
              unlockedLatch: StandardLatch,
              lockedLatch: StandardLatch) extends Actor with Fsm[CodeState] {
 
-    def initialState = State(NextState, locked, CodeState("", "33221"))
+    def initialState = State(NextState, locked, CodeState("", code))
 
     def locked: StateFunction = {
       case Event(digit: Char, CodeState(soFar, code)) => {
@@ -26,7 +26,7 @@ object FsmActorSpec {
                State(NextState, locked, CodeState(incomplete, code))
              case codeTry if (codeTry == code) => {
                doUnlock
-               new State(NextState, open, CodeState("", code), Some(timeout))
+               State(NextState, open, CodeState("", code), Some(timeout))
              }
              case wrong => {
                log.error("Wrong code %s", wrong)