Adding licenses in commit, fixed potential unhandled NPE in UrlProvider