Added error handling during restore