Handle non-strings a little better?