KRACOEUS-7595: Extra logic added to assist in avoiding the null document...

... number issue.