1 files changed, 3 insertions, 1 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java b/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
index 6ea67b90..69560ec1 100644
--- a/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
+++ b/aai-core/src/main/java/org/onap/aai/concurrent/AaiCallable.java
@@ -44,7 +44,9 @@ public abstract class AaiCallable<T> implements Callable<T> {
      * The call method
      */
     public T call() throws Exception {
-        MDC.setContextMap(mdcCopy);
+        if ( mdcCopy != null ) {
+            MDC.setContextMap(mdcCopy);
+        }
         return process();
     }