Update to fix of null pointer