Merge "Remove misleading unknown param error"