NPE didn't get caught in scope, and seem to bubbled up. Let's see if this fixes it.