Renamed uri to url.
Exception design improvements.