Merge "Skip case for fixing incorrect exception assertion"