fix null player check