Int 5035/adapt initial promises to only check components when present

This is the initial promises equivalent of #383