Player null bug fixed