Fixed issue #238 - Audit code for missing callback error handling paths

Closes #238
@gideonthomas, is this the right move here?