Revert "Issue #8: Handle adapter exceptions better"

This reverts commit dc9ffe25e9ed8ddc27d66f2d7d852f987f8b3722.