Making check more robust and bringing it in line with the other response objects.