Fix build

Weird build but resulting in NPE