Slight changes based on feedback

* defer restorer()
* slight change to error message checking