Add execution id is null check