Renamed ResolveStrategy->ResolverStrategy
Improved exception reporting for parse failures