Don't panic on bogus servernames

Also add a second version of the method to avoid filtering out non-utf8
names.

Closes #930