remove unagi only check; improve error handling if requested