diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
index af5f1441bb..4c40b5b4e5 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
@@ -163,7 +163,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
    */
   def serializerOf(serializerFQN: String): Try[Serializer] =
     system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, List(classOf[ExtendedActorSystem] -> system)) recoverWith {
-      case _ ⇒ system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, Nil)
+      case _: NoSuchMethodException ⇒ system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, Nil)
     }
 
   /**
diff --git a/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala b/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala
index 136f4c7f11..cb4b37101e 100644
--- a/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala
@@ -60,14 +60,14 @@ object LoggingDocSpec {
       reqId += 1
       val always = Map("requestId" -> reqId)
       val perMessage = currentMessage match {
-        case r: Req => Map("visitorId" -> r.visitorId)
-        case _      => Map()
+        case r: Req ⇒ Map("visitorId" -> r.visitorId)
+        case _      ⇒ Map()
       }
       always ++ perMessage
     }
 
     def receive: Receive = {
-      case r: Req => {
+      case r: Req ⇒ {
         log.info(s"Starting new request: ${r.work}")
       }
     }
@@ -75,7 +75,6 @@ object LoggingDocSpec {
 
   //#mdc-actor
 
-
   //#my-event-listener
   import akka.event.Logging.InitializeLogger
   import akka.event.Logging.LoggerInitialized
@@ -117,7 +116,7 @@ object LoggingDocSpec {
 
 class LoggingDocSpec extends AkkaSpec {
 
-  import LoggingDocSpec.{MyActor, MdcActor, MdcActorMixin, Req}
+  import LoggingDocSpec.{ MyActor, MdcActor, MdcActorMixin, Req }
 
   "use a logging actor" in {
     val myActor = system.actorOf(Props[MyActor])