#970, #973.  fixes to Health Check and error handling for large soqls.