handle broken ops, and reset state of ops that failed to clear
Merge pull request #1768 from rajatchopra/master

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