Remove debug code. that NPE won't happen in production