Clean and fix "not reloading after error" bug