Clean up the PlayerListener, add some null checks