Don't crash the server when committing.
Fix terminology.