ErrorCommand cleanup