Fixed similar NPEs in the future :)