Catch errors a bit better in CloudSearch... still not great.