diff --git a/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java b/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java
index <HASH>..<HASH> 100644
--- a/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java
+++ b/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java
@@ -104,7 +104,15 @@ public class ErrorReportLoggingHandler extends Handler {
         exceptionDataBuilder.setCount(exceptionDataBuilder.getCount() + 1);
         exceptionDataBuilder.setLasttime(new Date().toString());
         exceptionDataBuilder.setStacktrace(trace);
-        exceptionDataBuilder.setLogging(record.getMessage());
+
+        // Can cause NPE and crash HI
+        //exceptionDataBuilder.setLogging(record.getMessage());
+
+        if (record.getMessage() == null) {
+          exceptionDataBuilder.setLogging("");
+        } else {
+          exceptionDataBuilder.setLogging(record.getMessage());
+        }
       }
     }
   }
Fix NPE when logging exceptions that have no message using SLF4J (#<I>)

* Move uploader init above PackingPlan creation to fix NPE in case of bad PackingPlan



* Untested (but probably working) fix for NPE crash



* Set to empty string