1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala b/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala
index 9f8db3e..df21b48 100644
--- a/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala
+++ b/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala
@@ -16,8 +16,7 @@ class MdcExecutionContext(executionContext: ExecutionContext) extends ExecutionC
     executionContext.execute(new Runnable {
       def run(): Unit = {
         // copy caller thread diagnostic context to execution thread
-        // scalastyle:off
-        if (callerMdc != null) MDC.setContextMap(callerMdc)
+        Option(callerMdc).foreach(MDC.setContextMap)
         try {
           runnable.run()
         } finally {