Handle multiple errors on the stack
Merge pull request #541 from public/fix-466

Handle multiple errors on the stack