Fixing a weird bug we're having involving wrong error messages