Restore full uri in error message. Closes #2246