1 files changed, 5 insertions, 3 deletions
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
index 9d263456..b4bd2017 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
@@ -300,9 +300,11 @@ public class MetricLogger {
     }
     
     protected String formatString(String str) {
-    	str = str.replaceAll("\\R",""); // this will strip all new line characters
-    	str = str.replaceAll("\\|","%7C"); //log records should not contain a pipe, encode the pipe character
-    	return str;
+        if (str != null) {
+            str = str.replaceAll("\\R", ""); // this will strip all new line characters
+            str = str.replaceAll("\\|", "%7C"); // log records should not contain a pipe, encode the pipe character
+        }
+        return str;
     }
     
     public static void resetContext() {