(PUP-3521) Fix Puppet's exception swallowing

Fix Puppet's exception swallowing by finding places where an
Exception is rescued and swallowed and making their rescues
more granular.
Merge pull request #3302 from fpringvaldsen/PUP-3521-error-swallowing

(FOR REVIEW) (PUP-3521) Fix Puppet's exception swallowing