Would be nice to put this in the Interactor and check if the id is set.

You could save the id property in the execute.