Merge "URLDecoder : Improve error message" into nyc-dev