More error throwing for bad input