diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredential.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredential.java
index 7f78c6ab3..2aac2c7c8 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredential.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredential.java
@@ -426,7 +426,7 @@ private void parseSingle(final ASN1Primitive component, final boolean addToMappi
 
         } else if (component instanceof ASN1TaggedObject) {
             ASN1TaggedObject taggedObj = (ASN1TaggedObject) component;
-            parseSingle(taggedObj.getLoadedObject(), addToMapping, key);
+            parseSingle(taggedObj.getBaseObject().toASN1Primitive(), addToMapping, key);
 
         } else if (component instanceof ASN1OctetString) {
             // this may contain parseable data or may just be a OID key-pair value
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/PlatformCredentialTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/PlatformCredentialTest.java
index 43b06ae48..e75e4014c 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/PlatformCredentialTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/PlatformCredentialTest.java
@@ -573,7 +573,7 @@ public final void testPlatformConfiguration3() throws IOException, URISyntaxExce
                 .equals("BIOS"));
         Assertions.assertTrue(component.getComponentSerial()
                 .getString()
-                .equals(""));
+                .equals(ComponentIdentifier.EMPTY_COMPONENT));
         Assertions.assertTrue(component.getComponentRevision()
                 .getString()
                 .equals("DNKBLi5v.86A.0019.2017.0804.1146"));