Fixed issue where tooltip would not show because geometry was null