fix uri value type: incorrec type class
adjust for changed exceptions being thrown