Add check for expected containers in case they have been manually removed