Merge "Enhance validation decorator with error code"