Credit Markus for recent fix
Avoid NPE when underlying result point is null, for some reason