Fix not working restore functionality, improved error messaging on related function