Fixed issue with URIs containing "\r?\n" thus breaking the corresponding output.