handle broken ops, and reset state of ops that failed to clear

[merge]