update

Author: aracho1

registration/app/registration/CustomErrorHandler.scala

@@ -14,14 +14,17 @@ class CustomErrorHandler(env: Environment, config: Configuration, sourceMapper:
   private val logger: Logger = LoggerFactory.getLogger(this.getClass)
   override def onBadRequest(request: RequestHeader, message: String): Future[Result] = {
     val debugInfo = request.headers.get("User-Agent")
-    Option(MDC.get("invalidTopics")) match {
-      case Some(invalidTopics) =>
-        val allTopics = Option(MDC.get("allTopics")).getOrElse("")
-        logger.warn(s"Bad request: invalid topic type(s): [$invalidTopics]. All topics: [$allTopics]. User agent: $debugInfo")
-        MDC.remove("invalidTopics")
-        MDC.remove("allTopics")
-      case None =>
-        logger.error(s"Bad request due to $message. User agent = $debugInfo")
+    try {
+      Option(MDC.get("invalidTopics")) match {
+        case Some(invalidTopics) =>
+          val allTopics = Option(MDC.get("allTopics")).getOrElse("")
+          logger.warn(s"Bad request: invalid topic type(s): [$invalidTopics]. All topics: [$allTopics]. User agent: ${debugInfo.getOrElse("unknown")}")
+        case None =>
+          logger.error(s"Bad request due to $message. User agent: ${debugInfo.getOrElse("unknown")}")
+      }
+    } finally {
+      MDC.remove("invalidTopics")
+      MDC.remove("allTopics")
     }
     Future.successful(BadRequest("Bad request"))
   }