Yes, that is exactly the reason. I tried it and it broke a ton of unit tests. There are quite a few places which expect None when an operation value is invalid, and considering that is not the main goal of this PR and we want to limit the amount of time spent on the cleanup, I didn't change it to return an exception.