Now shows error message at the beginning of restore and not at the end