Tweaked error throwing.