Another possible race fix - still it is impossible to simulate the NPE issue
on my machine.