X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FWaypointListModel.java;h=350869713c0a2851ad5b47a17502b2422f303d11;hp=e5b41865e739a0cb08dc95382fc82eb692472ffd;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hpb=eebbb64b5d63f9eea43a0dff908c30361a376768

diff --git a/tim/prune/gui/WaypointListModel.java b/tim/prune/gui/WaypointListModel.java
index e5b4186..3508697 100644
--- a/tim/prune/gui/WaypointListModel.java
+++ b/tim/prune/gui/WaypointListModel.java
@@ -38,8 +38,11 @@ public class WaypointListModel extends AbstractListModel
 	 */
 	public Object getElementAt(int inIndex)
 	{
-		if (inIndex < 0 || inIndex >= getSize()) return "";
-		return _waypoints.get(inIndex).getWaypointName();
+		DataPoint p = null;
+		if (inIndex < 0 || inIndex >= getSize()
+			|| _waypoints == null || (p = _waypoints.get(inIndex)) == null)
+			return "";
+		return p.getWaypointName();
 	}
 
 	/**