Handle auth problems better