Issue #8: Handle adapter exceptions better