Error handling + in URL path segments...

We are form encoding URI path segments, which is not correct.