Add error trap conditional

May apply to *aws-sdk* issue next test round
Merge pull request #481 from Martii/s3errorTrapAddition

Add error trap conditional

Auto-merge