Fix the fix for NPE: Oops. It's working this time (tested locally).