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