DDF-77: Added check for failure parsing URI, based on code review comments