diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
index d19a1145d2..2b07b4b5ab 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
@@ -47,6 +47,9 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor {
         HashMap<String, String> headers = new HashMap<>();
 
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        if (requestAttributes == null) {
+            return null;
+        }
         HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
         Enumeration<String> headerNames = request.getHeaderNames();
         if (headerNames != null) {