Refactor and handle ring_not_ready during commit as well