Handle nil GeoNode to prevent spec failures

Merged Stan Hu requested to merge sh-handle-nil-geo-current-node into master