Remove urlencoding, fix error message