Oops, need a quick follow-up to r9380, as decoding unicode to unicode when specifying an encoding is not good...
Don't try to decode anything here, as an invalid URL should anyway be caught earlier.
Authored by: cboos 2010-03-21
Parent: [r9380]
Child: [r9382]
