More error throwing support