Fixed race condition

This fixes a race condition that was caused by the set of point
objects not being populated before the set of current points
was populated.  In order to fix this, there is a check at the
beginning to ensure that the point exists.

This also makes the code that handles displaying the points
clearer, so it is easier to understand how the coordinates are
extracted.