Updated driver error handling