Removed some debug stuff and updated null checks in the character
utility.