Added code to handle problematic player names