diff --git a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala
index a4dffdea94..775c8b554d 100644
--- a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala
+++ b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala
@@ -27,7 +27,7 @@ class AkkaClusterBroadcastFilter extends Actor with ClusterBroadcastFilter {
   /**
    * Stops the actor
    */
-  def destroy: Unit = self.stop
+  def destroy(): Unit = self.stop
 
   /**
    * Relays all non ClusterCometBroadcast messages to the other AkkaClusterBroadcastFilters in the cluster
diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/Security.scala
index f550177965..b0f3c10be0 100644
--- a/akka-http/src/main/scala/Security.scala
+++ b/akka-http/src/main/scala/Security.scala
@@ -22,7 +22,7 @@
 
 package se.scalablesolutions.akka.security
 
-import se.scalablesolutions.akka.actor.{Scheduler, Actor, ActorRef, ActorRegistry}
+import se.scalablesolutions.akka.actor.{Scheduler, Actor, ActorRef, ActorRegistry, IllegalActorStateException}
 import se.scalablesolutions.akka.actor.Actor._
 import se.scalablesolutions.akka.config.Config
 import se.scalablesolutions.akka.util.Logging
@@ -102,7 +102,7 @@ class AkkaSecurityFilterFactory extends ResourceFilterFactory with Logging {
 
   lazy val authenticatorFQN = {
     val auth = Config.config.getString("akka.rest.authenticator", "N/A")
-    if (auth == "N/A") throw new IllegalStateException("The config option 'akka.rest.authenticator' is not defined in 'akka.conf'")
+    if (auth == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.authenticator' is not defined in 'akka.conf'")
     auth
   }
 
@@ -400,7 +400,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w
    */
   lazy val servicePrincipal = {
     val p = Config.config.getString("akka.rest.kerberos.servicePrincipal", "N/A")
-    if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.servicePrincipal' is not defined in 'akka.conf'")
+    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.servicePrincipal' is not defined in 'akka.conf'")
     p
   }
 
@@ -409,13 +409,13 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w
    */
   lazy val keyTabLocation = {
     val p = Config.config.getString("akka.rest.kerberos.keyTabLocation", "N/A")
-    if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.keyTabLocation' is not defined in 'akka.conf'")
+    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.keyTabLocation' is not defined in 'akka.conf'")
     p
   }
 
   lazy val kerberosDebug = {
     val p = Config.config.getString("akka.rest.kerberos.kerberosDebug", "N/A")
-    if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.kerberosDebug' is not defined in 'akka.conf'")
+    if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.kerberosDebug' is not defined in 'akka.conf'")
     p
   }