diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/IssuedCertificateAttributeHelper.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/IssuedCertificateAttributeHelper.java
index 8a642133..24cbf53e 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/IssuedCertificateAttributeHelper.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/IssuedCertificateAttributeHelper.java
@@ -114,8 +114,10 @@ public final class IssuedCertificateAttributeHelper {
         // assemble AIK cert SAN, using info from EC and PC
         X500NameBuilder nameBuilder = new X500NameBuilder();
         populateEndorsementCredentialAttributes(endorsementCredential, nameBuilder);
-        for (PlatformCredential platformCredential : platformCredentials) {
-            populatePlatformCredentialAttributes(platformCredential, nameBuilder);
+        if (platformCredentials != null) {
+            for (PlatformCredential platformCredential : platformCredentials) {
+                populatePlatformCredentialAttributes(platformCredential, nameBuilder);
+            }
         }
 
         // add the OID for the TCG-required TPM ID label