URL parsing exceptions + minor touches.