Added improved URI verification.