Improved apiv2 search exception handling