Maybe handle UTF-8 failures better?