diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/ComponentResult.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/ComponentResult.java
index 5874d01e..a9beff48 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/ComponentResult.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/ComponentResult.java
@@ -33,7 +33,7 @@ public class ComponentResult extends ArchivableEntity {
     private String model;
     private String serialNumber;
     private String revisionNumber;
-    private boolean fieldReplaceable;
+    private boolean fieldReplaceable = false;
     // this is a string because component class doesn't inherit serializable.
     @Setter
     private String componentClassValue;
@@ -68,7 +68,9 @@ public class ComponentResult extends ArchivableEntity {
         this.model = componentIdentifier.getComponentModel().toString();
         this.serialNumber = componentIdentifier.getComponentSerial().toString();
         this.revisionNumber = componentIdentifier.getComponentRevision().toString();
-        this.fieldReplaceable = componentIdentifier.getFieldReplaceable().isTrue();
+        if (componentIdentifier.getFieldReplaceable() != null) {
+            this.fieldReplaceable = componentIdentifier.getFieldReplaceable().isTrue();
+        }
 
         StringBuilder sb = new StringBuilder();
         for (ComponentAddress element : componentIdentifier.getComponentAddress()) {
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentIdentifier.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentIdentifier.java
index 7f3b26eb..cb7394ad 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentIdentifier.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/ComponentIdentifier.java
@@ -237,7 +237,7 @@ public class ComponentIdentifier {
             sb.append(fieldReplaceable.toString());
         }
         sb.append(", componentAddress=");
-        if (componentAddress.size() > 0) {
+        if (!componentAddress.isEmpty()) {
             sb.append(componentAddress
                     .stream()
                     .map(Object::toString)
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 1dbb3b3a..32bf1193 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
@@ -325,12 +325,12 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
             if (!deviceHashMap.containsKey(componentResult.hashCommonElements())) {
                 // didn't find the component result in the hashed mapping
                 remainingComponentResults.add(componentResult);
+            } else {
+                log.error("Found the component class value {}", componentResult.getComponentClassValue());
             }
         }
         if (!remainingComponentResults.isEmpty()) {
             // continue down the options, move to a different method.
-
-
             // create component class mapping to component info
             Map<String, List<ComponentInfo>> componentDeviceMap = new HashMap<>();
             componentInfos.stream().forEach((componentInfo) -> {
@@ -351,7 +351,7 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
             for (ComponentResult componentResult : remainingComponentResults) {
                 componentClassInfo = componentDeviceMap.get(componentResult.getComponentClassValue());
                 if (componentClassInfo.size() == 1) {
-                    attributeResults.addAll(generateComponentResults(componentClassInfo, componentResult));
+                    attributeResults.addAll(generateComponentResults(componentClassInfo.get(0), componentResult));
                 } else {
                     attributeResults.addAll(matchBasedOnAttributes(componentClassInfo, componentResult));
                 }
@@ -393,19 +393,34 @@ public class CertificateAttributeScvValidator extends SupplyChainCredentialValid
         }
     }
 
+    /**
+     * This method produces component attribute results for a single device that was found
+     * by component class.
+     * @param componentInfo the device object
+     * @param componentResult the certificate expected object
+     * @return a list of attribute match results
+     */
     private static List<ComponentAttributeResult> generateComponentResults(
-            final List<ComponentInfo> componentInfos,
+            final ComponentInfo componentInfo,
             final ComponentResult componentResult) {
         // there are instances of components with the same class (ie hard disks, memory)
         List<ComponentAttributeResult> attributeResults = new ArrayList<>();
-        for (ComponentInfo componentInfo : componentInfos) {
-            // just do a single pass and save the values
+        if (!componentInfo.getComponentManufacturer().equals(componentResult.getManufacturer())) {
             attributeResults.add(new ComponentAttributeResult(componentResult.getId(),
                     componentResult.getManufacturer(), componentInfo.getComponentManufacturer()));
+        }
+
+        if (!componentInfo.getComponentModel().equals(componentResult.getModel())) {
             attributeResults.add(new ComponentAttributeResult(componentResult.getId(),
                     componentResult.getModel(), componentInfo.getComponentModel()));
+        }
+
+        if (!componentInfo.getComponentSerial().equals(componentResult.getSerialNumber())) {
             attributeResults.add(new ComponentAttributeResult(componentResult.getId(),
                     componentResult.getSerialNumber(), componentInfo.getComponentSerial()));
+        }
+
+        if (!componentInfo.getComponentRevision().equals(componentResult.getRevisionNumber())) {
             attributeResults.add(new ComponentAttributeResult(componentResult.getId(),
                     componentResult.getRevisionNumber(), componentInfo.getComponentRevision()));
         }