- Fixed possible NULL ptr dereference