Merge "Bug 383 - exception raised if key part of URI is incorrect"