From bd023b68593fd7908ff88f6312d18cd91047684b Mon Sep 17 00:00:00 2001
From: "U-BASIS\\zhaohui" <zhaohui@win-cray-4678.basistech.net>
Date: Thu, 13 Oct 2016 13:44:26 -0400
Subject: [PATCH] 2020: instead of passing a msg from getLocalizedMessage()
 method, pass an string of error message to avoid a NPE problem

---
 .../sleuthkit/autopsy/modules/stix/STIXReportModule.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
index 697d58c2e7..111e16bddb 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
@@ -172,11 +172,13 @@ public class STIXReportModule implements GeneralReportModule {
                 try {
                     processFile(file.getAbsolutePath(), progressPanel, output);
                 } catch (TskCoreException | JAXBException ex) {
-                    logger.log(Level.SEVERE, String.format("Unable to process STIX file %s", file), ex); //NON-NLS
+                    String errMsg = String.format("Unable to process STIX file %s", file);
+                    logger.log(Level.SEVERE, errMsg, ex); //NON-NLS
                     MessageNotifyUtil.Notify.show("STIXReportModule", //NON-NLS
-                            ex.getLocalizedMessage(),
+                            errMsg,
                             MessageNotifyUtil.MessageType.ERROR);
                     hadErrors = true;
+                    break;
                 }
                 // Clear out the ID maps before loading the next file
                 idToObjectMap = new HashMap<String, ObjectType>();