Used to NPE on me before the change.