error handling commit