diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
index ee4c8403..ccd5adf9 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/CertificateAttributeScvValidator.java
@@ -265,12 +265,10 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
             List<ComponentIdentifierV2> allV2PcComponents
                     = new ArrayList<>(platformCredential.getComponentIdentifiersV2());
 
-            if (componentInfos == null) {
-                log.error("The device's reported list of components is null.");
-                passesValidation = false;
-            } else if (componentInfos.size() != allV2PcComponents.size()) {
+            if (componentInfos.size() != allV2PcComponents.size()) {
                 log.error(
-                        "The device's reported list of components' sizes (size of {}) do not match the size (size of {}) "
+                        "The device's reported list of components' sizes (size of {}) " +
+                                "do not match the size (size of {}) "
                                 + "of the platform credential's version 2 component identifiers.",
                         componentInfos.size(), allV2PcComponents.size());
 
diff --git a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java
index d749ea2a..83feb030 100644
--- a/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java
+++ b/HIRS_AttestationCA/src/test/java/hirs/attestationca/persist/validation/SupplyChainCredentialValidatorTest.java
@@ -1306,8 +1306,8 @@ public class SupplyChainCredentialValidatorTest {
     }
 
     /**
-     * Second test that tests that TPM 2.0 Platform Credentials validate correctly against the device info report
-     * when there are components present, and when the PlatformSerial field holds the system's
+     * Second test that tests that TPM 2.0 Platform Credentials validate correctly against the device info
+     * report when there are components present, and when the PlatformSerial field holds the system's
      * serial number instead of the baseboard serial number.
      *
      * @throws IOException        if unable to set up DeviceInfoReport from resource file