Fix issue where we don't detect a charset and attempt to look up a name ...

...anyways