Merge pull request #9 from almozavr/patch-1

Fix DebugNotification#toString if throwable null
ReactiveX · Oct 25, 2015 · 4bb9b0b · 4bb9b0b
2 parents 832ca86 + 4b74ddb
commit 4bb9b0b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/rx/plugins/DebugNotification.java b/src/main/java/rx/plugins/DebugNotification.java
@@ -150,7 +150,7 @@ public String toString() {
         if (kind == Kind.OnNext)
             s.append(", \"value\": ").append(quote(value));
         if (kind == Kind.OnError)
-            s.append(", \"exception\": \"").append(throwable.getMessage().replace("\\", "\\\\").replace("\"", "\\\"")).append("\"");
+            s.append(", \"exception\": \"").append(throwable.getMessage() == null ? throwable.getClass().getSimpleName() : throwable.getMessage().replace("\\", "\\\\").replace("\"", "\\\"")).append("\"");
         if (kind == Kind.Request)
             s.append(", \"n\": ").append(n);
         if (source != null)