Add more unit tests around this, especially around re-enabling forms when there is an error.