error handling y commit final