diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
index ebd3e015..1637a3e4 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
@@ -18,6 +18,7 @@ import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.UUID;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -157,7 +158,7 @@ public class ReferenceManifestDetailsPageController
             data.put("rimType", rim.getRimType());
             List<SwidResource> resources = rim.parseResource();
             String resourceFilename = null;
-            TCGEventLog logProcessor = new TCGEventLog();
+            TCGEventLog logProcessor;
 
             try {
                 for (SwidResource swidRes : resources) {
@@ -171,8 +172,7 @@ public class ReferenceManifestDetailsPageController
                         swidRes.setPcrValues(Arrays.asList(
                                 logProcessor.getExpectedPCRValues()));
                     } else {
-                        swidRes.setPcrValues(Arrays.asList(
-                                logProcessor.getExpectedPCRValues()));
+                        swidRes.setPcrValues(new ArrayList<>());
                     }
                 }
             } catch (NoSuchFileException nsfEx) {
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
index 642fbf60..367d357a 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
@@ -127,46 +127,53 @@
                                                         <span data-toggle="tooltip" data-placement="top" title="Resource File">${resource.getName()}
                                                         </span>
                                                     </div>
-                                                    <div class="component col col-md-10">                                                            
-                                                        <span class="fieldHeader">File Size:</span>
-                                                        <span class="fieldValue">${resource.getSize()}</span><br/>
-                                                        <span class="fieldHeader">Hash:</span>
-                                                        <span class="fieldValue" style="overflow-wrap: break-word">${resource.getHashValue()}</span><br/>
-                                                        <c:if test="${not empty resource.getRimFormat()}">
-                                                            <span class="fieldHeader">RIM Format:</span>
-                                                            <span class="fieldValue">${resource.getRimFormat()}</span><br/>
-                                                        </c:if>
-                                                        <c:if test="${not empty resource.getRimType()}">
-                                                            <span class="fieldHeader">RIM Type:</span>
-                                                            <span class="fieldValue">${resource.getRimType()}</span><br/>
-                                                        </c:if>
-                                                        <c:if test="${not empty resource.getRimUriGlobal()}">
-                                                            <span class="fieldHeader">URI Global:</span>
-                                                            <span class="fieldValue">${resource.getRimUriGlobal()}</span><br/>
-                                                        </c:if>
-                                                        <c:if test="${not empty resource.getPcrValues()}"> 
-                                                            <div class="panel-body">
-                                                                <div class="component" role="tab" id="pcrValues">
-                                                                    <a role="button" data-toggle="collapse" data-parent="#directorycollapse" class="collapsed"
-                                                                       href="#pcrscollapse" aria-expanded="false" aria-controls="pcrscollapse">
-                                                                        Expected PCR Values
-                                                                    </a>                                                         
-                                                                </div>
-                                                                <div id="pcrscollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
-                                                                    <div>
-                                                                        <c:forEach items="${resource.getPcrMap()}" var="pcrValue">
-                                                                            <div id="componentIdentifier" class="row">
-                                                                                <div>                                                                                    
-                                                                                    <span>${pcrValue.key}</span>
-                                                                                    <span style="overflow-wrap: break-word">${pcrValue.value}</span>
-                                                                                </div>
+                                                    <c:choose>
+                                                        <c:when test="${not empty resource.getPcrValues()}">
+                                                            <div class="component col col-md-10">
+                                                                <span class="fieldHeader">File Size:</span>
+                                                                <span class="fieldValue">${resource.getSize()}</span><br/>
+                                                                <span class="fieldHeader">Hash:</span>
+                                                                <span class="fieldValue" style="overflow-wrap: break-word">${resource.getHashValue()}</span><br/>
+                                                                <c:if test="${not empty resource.getRimFormat()}">
+                                                                    <span class="fieldHeader">RIM Format:</span>
+                                                                    <span class="fieldValue">${resource.getRimFormat()}</span><br/>
+                                                                </c:if>
+                                                                <c:if test="${not empty resource.getRimType()}">
+                                                                    <span class="fieldHeader">RIM Type:</span>
+                                                                    <span class="fieldValue">${resource.getRimType()}</span><br/>
+                                                                </c:if>
+                                                                <c:if test="${not empty resource.getRimUriGlobal()}">
+                                                                    <span class="fieldHeader">URI Global:</span>
+                                                                    <span class="fieldValue">${resource.getRimUriGlobal()}</span><br/>
+                                                                </c:if>
+                                                                <c:if test="${not empty resource.getPcrValues()}"> 
+                                                                    <div class="panel-body">
+                                                                        <div class="component" role="tab" id="pcrValues">
+                                                                            <a role="button" data-toggle="collapse" data-parent="#directorycollapse" class="collapsed"
+                                                                               href="#pcrscollapse" aria-expanded="false" aria-controls="pcrscollapse">
+                                                                                Expected PCR Values
+                                                                            </a>                                                         
+                                                                        </div>
+                                                                        <div id="pcrscollapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
+                                                                            <div>
+                                                                                <c:forEach items="${resource.getPcrMap()}" var="pcrValue">
+                                                                                    <div id="componentIdentifier" class="row">
+                                                                                        <div>                                                                                    
+                                                                                            <span>${pcrValue.key}</span>
+                                                                                            <span style="overflow-wrap: break-word">${pcrValue.value}</span>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </c:forEach>
                                                                             </div>
-                                                                        </c:forEach>
+                                                                        </div>
                                                                     </div>
-                                                                </div>
+                                                                </c:if>
                                                             </div>
-                                                        </c:if>
-                                                    </div>
+                                                        </c:when>                                                        
+                                                        <c:otherwise>
+                                                            <div class="component col col-md-10" style="color: red; padding-left: 20px">File Not Found.</div>
+                                                        </c:otherwise>
+                                                    </c:choose>
                                                 </div>                                                    
                                             </div>
                                         </c:forEach>
diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/SwidResource.java b/HIRS_Utils/src/main/java/hirs/data/persist/SwidResource.java
index b851c3ae..0db88fe5 100644
--- a/HIRS_Utils/src/main/java/hirs/data/persist/SwidResource.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/SwidResource.java
@@ -213,9 +213,6 @@ public class SwidResource {
         return innerMap;
     }
 
-    /**
-     *
-     */
     private void parsePcrValues() {
         TCGEventLog logProcessor = new TCGEventLog();