MARI-45 MARI-46 updated to check if point exists before using