Better logging w/MDC to find NPE.