Merge "Silent false positive, and enhance real error message"