Fix NPE I'm seeing locally.