Fixed #630 (null player was used)