Merge "Revert "Fix for Character.getName throwing NPE.""