Commit after setting up everything right after everything went wrong