CRUNCH-349 Avoid NPE when logging NPE