Maybe fixed a potential NPE?