commit error handler
commit refactor