Revert the error trap routine

* This should probably be readdressed soon but this handler is part of the reason why we can't upgrade to the latest *aws-sdk*. Will issue sometime tomorrow'ish.
Merge pull request #483 from Martii/revertErrorTrap

Revert the error trap routine

Auto-merge