Allowed resolvers to throw exceptions.
Improved exception handling