Re: patch for error handling after driver callback calls.