Maybe add "None" here to make it optional?