Merge "ITS: check error in mm correctly"