Work around #8256, do not fail the task, just return None