diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/certificate/attributes/ComponentClass.java b/HIRS_Utils/src/main/java/hirs/data/persist/certificate/attributes/ComponentClass.java
index 7d751cf6..e96b398e 100644
--- a/HIRS_Utils/src/main/java/hirs/data/persist/certificate/attributes/ComponentClass.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/certificate/attributes/ComponentClass.java
@@ -195,7 +195,13 @@ public class ComponentClass {
      */
     @Override
     public String toString() {
-        return String.format("%s%n%s - %s", registryType, category, component);
+        String resultString;
+        if (component.equals(UNKNOWN_STRING) || component.equals(OTHER_STRING)) {
+            resultString = String.format("%s%n%s", registryType, category);
+        } else {
+            resultString = String.format("%s%n%s - %s", registryType, category, component);
+        }
+        return resultString;
     }
 
     /**