- Fixed crash when an error is triggered on resolver
Merge remote branch 'upstream/master'
- Drop unneeded nesting