Prevent out of bound errors from commit-time failures