diff --git a/akka-amqp/src/main/scala/AMQP.scala b/akka-amqp/src/main/scala/AMQP.scala
index 14c2b742ef..b00ec7f57f 100644
--- a/akka-amqp/src/main/scala/AMQP.scala
+++ b/akka-amqp/src/main/scala/AMQP.scala
@@ -558,8 +558,8 @@ object AMQP {
       }
     }
 
-    override def preRestart(reason: AnyRef) = disconnect
+    override def preRestart(reason: Throwable) = disconnect
 
-    override def postRestart(reason: AnyRef) = reconnect(initReconnectDelay)
+    override def postRestart(reason: Throwable) = reconnect(initReconnectDelay)
   }
 }
diff --git a/akka-core/src/main/scala/actor/ActiveObject.scala b/akka-core/src/main/scala/actor/ActiveObject.scala
index be0b59c0d9..114e5c854b 100644
--- a/akka-core/src/main/scala/actor/ActiveObject.scala
+++ b/akka-core/src/main/scala/actor/ActiveObject.scala
@@ -413,13 +413,13 @@ private[akka] class Dispatcher(transactionalRequired: Boolean, val callbacks: Op
       throw new IllegalStateException("Unexpected message [" + unexpected + "] sent to [" + this + "]")
   }
 
-  override protected def preRestart(reason: AnyRef) {
+  override protected def preRestart(reason: Throwable) {
     try {
       if (preRestart.isDefined) preRestart.get.invoke(target.get, ZERO_ITEM_OBJECT_ARRAY: _*)
     } catch { case e: InvocationTargetException => throw e.getCause }
   }
 
-  override protected def postRestart(reason: AnyRef) {
+  override protected def postRestart(reason: Throwable) {
     try {
       if (postRestart.isDefined) postRestart.get.invoke(target.get, ZERO_ITEM_OBJECT_ARRAY: _*)
     } catch { case e: InvocationTargetException => throw e.getCause }
diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index db16268159..076d945360 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -44,7 +44,7 @@ abstract class RemoteActor(hostname: String, port: Int) extends Actor {
 
 @serializable sealed trait LifeCycleMessage
 case class HotSwap(code: Option[PartialFunction[Any, Unit]]) extends LifeCycleMessage
-case class Restart(reason: AnyRef) extends LifeCycleMessage
+case class Restart(reason: Throwable) extends LifeCycleMessage
 case class Exit(dead: Actor, killer: Throwable) extends LifeCycleMessage
 case object Kill extends LifeCycleMessage
 
@@ -389,7 +389,7 @@ trait Actor extends TransactionManagement {
    * Mandatory callback method that is called during restart and reinitialization after a server crash.
    * To be implemented by subclassing actor.
    */
-  protected def preRestart(reason: AnyRef) = {}
+  protected def preRestart(reason: Throwable) = {}
 
   /**
    * User overridable callback/setting.
@@ -397,7 +397,7 @@ trait Actor extends TransactionManagement {
    * Mandatory callback method that is called during restart and reinitialization after a server crash.
    * To be implemented by subclassing actor.
    */
-  protected def postRestart(reason: AnyRef) = {}
+  protected def postRestart(reason: Throwable) = {}
 
   /**
    * User overridable callback/setting.
@@ -981,7 +981,7 @@ trait Actor extends TransactionManagement {
     }
   }
 
-  private[this] def restartLinkedActors(reason: AnyRef) = {
+  private[this] def restartLinkedActors(reason: Throwable) = {
     getLinkedActors.toArray.toList.asInstanceOf[List[Actor]].foreach {
       actor =>
         if (actor.lifeCycle.isEmpty) actor.lifeCycle = Some(LifeCycle(Permanent))
@@ -1000,7 +1000,7 @@ trait Actor extends TransactionManagement {
     }
   }
 
-  private[Actor] def restart(reason: AnyRef) = synchronized {
+  private[Actor] def restart(reason: Throwable) = synchronized {
     preRestart(reason)
     Actor.log.info("Restarting actor [%s] configured as PERMANENT.", id)
     postRestart(reason)
diff --git a/akka-core/src/test/scala/RemoteSupervisorTest.scala b/akka-core/src/test/scala/RemoteSupervisorTest.scala
index 008bebed85..efbf5a4644 100644
--- a/akka-core/src/test/scala/RemoteSupervisorTest.scala
+++ b/akka-core/src/test/scala/RemoteSupervisorTest.scala
@@ -33,8 +33,8 @@ object Log {
       throw new RuntimeException("DIE")
   }
 
-  override protected def postRestart(reason: AnyRef) {
-    Log.messageLog += reason.asInstanceOf[Exception].getMessage
+  override protected def postRestart(reason: Throwable) {
+    Log.messageLog += reason.getMessage
   }
 }
 
@@ -48,8 +48,8 @@ object Log {
       throw new RuntimeException("DIE")
   }
 
-  override protected def postRestart(reason: AnyRef) {
-    Log.messageLog += reason.asInstanceOf[Exception].getMessage
+  override protected def postRestart(reason: Throwable) {
+    Log.messageLog += reason.getMessage
   }
 }
 
@@ -63,8 +63,8 @@ object Log {
       throw new RuntimeException("DIE")
   }
 
-  override protected def postRestart(reason: AnyRef) {
-    Log.messageLog += reason.asInstanceOf[Exception].getMessage
+  override protected def postRestart(reason: Throwable) {
+    Log.messageLog += reason.getMessage
   }
 }
 
diff --git a/akka-core/src/test/scala/SupervisorTest.scala b/akka-core/src/test/scala/SupervisorTest.scala
index 543e8d3a45..d236c03a44 100644
--- a/akka-core/src/test/scala/SupervisorTest.scala
+++ b/akka-core/src/test/scala/SupervisorTest.scala
@@ -556,8 +556,8 @@ class SupervisorTest extends JUnitSuite {
       case Die =>
         throw new RuntimeException("DIE")
     }
-    override protected def postRestart(reason: AnyRef) {
-      messageLog += reason.asInstanceOf[Exception].getMessage      
+    override protected def postRestart(reason: Throwable) {
+      messageLog += reason.getMessage
     }
   }
 
@@ -569,8 +569,8 @@ class SupervisorTest extends JUnitSuite {
       case Die =>
         throw new RuntimeException("DIE")
     }
-    override protected def postRestart(reason: AnyRef) {
-      messageLog += reason.asInstanceOf[Exception].getMessage
+    override protected def postRestart(reason: Throwable) {
+      messageLog += reason.getMessage
     }
   }
 
@@ -583,8 +583,8 @@ class SupervisorTest extends JUnitSuite {
         throw new RuntimeException("DIE")
     }
 
-    override protected def postRestart(reason: AnyRef) {
-      messageLog += reason.asInstanceOf[Exception].getMessage
+    override protected def postRestart(reason: Throwable) {
+      messageLog += reason.getMessage
     }
   }
 }
diff --git a/akka-samples-security/src/main/scala/SimpleService.scala b/akka-samples-security/src/main/scala/SimpleService.scala
index e9468ec75c..dad62b7b2d 100644
--- a/akka-samples-security/src/main/scala/SimpleService.scala
+++ b/akka-samples-security/src/main/scala/SimpleService.scala
@@ -33,7 +33,7 @@ class Boot {
 
 
   val supervisor = factory.newInstance
- supervisor.start
+  supervisor.start
 }
 
 /*