Removed UrlResolver dependency, added Error reporting feature