Fix NPE via BugSense