Commit working version before error handling