diff --git a/metacat-main/src/main/java/com/netflix/metacat/main/api/RequestWrapper.java b/metacat-main/src/main/java/com/netflix/metacat/main/api/RequestWrapper.java
index 304c9873..ca981b75 100644
--- a/metacat-main/src/main/java/com/netflix/metacat/main/api/RequestWrapper.java
+++ b/metacat-main/src/main/java/com/netflix/metacat/main/api/RequestWrapper.java
@@ -161,7 +161,11 @@ public <R> R processRequest(
         log.info(MetacatContextManager.getContext().toString());
         log.info(MetacatContextManager.getContext().getClientAppName());
         log.info("------------------------------------------------");
-        tags.put("caller", MetacatContextManager.getContext().getClientAppName());
+        String clientAppName =  MetacatContextManager.getContext().getClientAppName();
+        if (clientAppName == null) {
+            clientAppName = "I SET IT NULL";
+        }
+        tags.put("caller", clientAppName);
         registry.counter(requestCounterId.withTags(tags)).increment();
 
         try {