Updated PlayerActivity to be more robust