diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index ee53fec688..45e5487bc3 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -62,6 +62,8 @@ import java.util.concurrent.atomic.AtomicBoolean
  *       val msg = ((Request3) o).getMsg();
  *       getSender().tell(other.ask(msg, 5000)); // reply with Future for holding the other’s reply (timeout 5 seconds)
  *
+ *     } else {
+ *       unhandled(o);
  *     }
  *   }
  * }
diff --git a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java b/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
index 488d72a3b4..132dc990ee 100644
--- a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
+++ b/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
@@ -39,6 +39,8 @@ public class FaultHandlingTestBase {
     public void onReceive(Object o) {
       if (o instanceof Props) {
         getSender().tell(getContext().actorOf((Props) o));
+      } else {
+        unhandled(o);
       }
     }
   }
@@ -49,6 +51,8 @@ public class FaultHandlingTestBase {
     public void onReceive(Object o) {
       if (o instanceof Props) {
         getSender().tell(getContext().actorOf((Props) o));
+      } else {
+        unhandled(o);
       }
     }
     
@@ -70,6 +74,8 @@ public class FaultHandlingTestBase {
         state = (Integer) o;
       } else if (o.equals("get")) {
         getSender().tell(state);
+      } else {
+        unhandled(o);
       }
     }
   }
diff --git a/akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java b/akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java
index 1998c45a76..f9d1ad8799 100644
--- a/akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java
+++ b/akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java
@@ -69,6 +69,8 @@ public class SchedulerDocTestBase {
           public void onReceive(Object message) {
             if (message.equals("Tick")) {
               // Do someting
+            } else {
+              unhandled(message);
             }
           }
         };
diff --git a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java b/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java
index 0985861b00..d442ae6461 100644
--- a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java
+++ b/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java
@@ -259,6 +259,8 @@ public class UntypedActorDocTestBase {
         getContext().become(angry);
       } else if (message.equals("foo")) {
         getContext().become(happy);
+      } else {
+        unhandled(message);
       }
     }
   }
@@ -282,6 +284,8 @@ public class UntypedActorDocTestBase {
         if (t.getActor() == child) {
           lastSender.tell("finished");
         }
+      } else {
+        unhandled(message);
       }
     }
   }
diff --git a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java b/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
index 19c6c36641..c3278f23bd 100644
--- a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
+++ b/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
@@ -290,6 +290,8 @@ public class FutureDocTestBase {
         } else {
           getSender().tell(i);
         }
+      } else {
+        unhandled(message);
       }
     }
   }
diff --git a/akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java b/akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java
index 84bd33cb3b..dca10b8984 100644
--- a/akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java
+++ b/akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java
@@ -34,6 +34,8 @@ public class CoordinatedCounter extends UntypedActor {
             }
         } else if ("GetCount".equals(incoming)) {
             getSender().tell(count.single().get());
+        } else {
+          unhandled(incoming);
         }
     }
 }
diff --git a/akka-docs/java/code/akka/docs/transactor/Coordinator.java b/akka-docs/java/code/akka/docs/transactor/Coordinator.java
index 37d7c935cb..6854ed99f6 100644
--- a/akka-docs/java/code/akka/docs/transactor/Coordinator.java
+++ b/akka-docs/java/code/akka/docs/transactor/Coordinator.java
@@ -22,6 +22,8 @@ public class Coordinator extends UntypedActor {
                 });
                 //#coordinated-atomic
             }
+        } else {
+          unhandled(incoming);
         }
     }
 }
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java
index fa41b94aab..415e049fd0 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java
@@ -19,6 +19,9 @@ public class JAdvancedCalculatorActor extends UntypedActor {
             Op.Divide divide = (Op.Divide) message;
             System.out.println("Calculating " + divide.getN1() + " / " + divide.getN2());
             getSender().tell(new Op.DivisionResult(divide.getN1(), divide.getN2(), divide.getN1() / divide.getN2()));
+            
+        } else {
+          unhandled(message);
         }
     }
 }
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java
index 19a957e717..64200c26de 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java
@@ -34,6 +34,8 @@ public class JCreationActor extends UntypedActor {
                 System.out.println("Div result: " + result.getN1() + " / " +
                         result.getN2() + " = " + formatter.format(result.getResult()));
             }
+        } else {
+          unhandled(message);
         }
     }
 }
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java
index 2bd32c2483..a690bc0024 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java
@@ -31,6 +31,8 @@ public class JLookupActor extends UntypedActor {
                 System.out.println("Sub result: " + result.getN1() + " - " +
                         result.getN2() + " = " + result.getResult());
             }
+        } else {
+          unhandled(message);
         }
     }
 }
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java
index 927da641f2..14412d5e05 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java
@@ -19,6 +19,9 @@ public class JSimpleCalculatorActor extends UntypedActor {
             Op.Subtract subtract = (Op.Subtract) message;
             System.out.println("Calculating " + subtract.getN1() + " - " + subtract.getN2());
             getSender().tell(new Op.SubtractResult(subtract.getN1(), subtract.getN2(), subtract.getN1() - subtract.getN2()));
+            
+        } else {
+          unhandled(message);
         }
     }
 }