Attempt to ensure the validator always cleans up properly.