Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 406)
+++ /trunk/build.xml	(revision 407)
@@ -31,4 +31,5 @@
 
 		<!-- create josm-custom.jar -->
+		<delete file="dist/josm-custom.jar"/>
 		<jar destfile="dist/josm-custom.jar" basedir="build">
 			<manifest>
Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 406)
+++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 407)
@@ -80,5 +80,5 @@
 		HashSet<Relation> relationsUsingWays = new HashSet<Relation>();
 		for (Relation r : Main.ds.relations) {
-			if (r.deleted) continue;
+			if (r.deleted || r.incomplete) continue;
 			for (RelationMember rm : r.members) {
 				if (rm.member instanceof Way) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java	(revision 406)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java	(revision 407)
@@ -46,6 +46,5 @@
 	public void visit(Node n) {
 		for (Way w : ds.ways) {
-			if (w.deleted)
-				continue;
+			if (w.deleted || w.incomplete) continue;
 			for (Node n2 : w.nodes) {
 				if (n == n2) {
Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 406)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 407)
@@ -157,11 +157,10 @@
 		TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
 		for (Way w : Main.ds.ways) {
-			if (w.deleted)
-				continue;
+			if (w.deleted || w.incomplete) continue;
 			Node lastN = null;
 			int i = -2;
 			for (Node n : w.nodes) {
 				i++;
-				if (n.deleted) continue;
+				if (n.deleted || n.incomplete) continue;
 				if (lastN == null) {
 					lastN = n;
@@ -261,8 +260,8 @@
 		Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>();
 			for (Way w : Main.ds.ways) {
-			if (w.deleted) continue;
+			if (w.deleted || w.incomplete) continue;
 			Node lastN = null;
 			for (Node n : w.nodes) {
-				if (n.deleted) continue;
+				if (n.deleted || n.incomplete) continue;
 				if (lastN == null) {
 					lastN = n;
@@ -283,5 +282,6 @@
 			}
 		for (Node n : Main.ds.nodes) {
-			if (!n.deleted && getPoint(n.eastNorth).distanceSq(p) < 100) {
+			if (!n.deleted && !n.incomplete
+					&& getPoint(n.eastNorth).distanceSq(p) < 100) {
 				nearest.add(n);
 			}
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 406)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 407)
@@ -484,5 +484,5 @@
 		TreeMap<Relation, Collection<String>> roles = new TreeMap<Relation, Collection<String>>();
 		for (Relation r : Main.ds.relations) {
-			if (!r.deleted) {
+			if (!r.deleted && !r.incomplete) {
 				for (RelationMember m : r.members) {
 					if (newSelection.contains(m.member)) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 406)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 407)
@@ -123,5 +123,5 @@
 		int i = 0;
 		for (Relation e : Main.ds.relations) {
-			if (!e.deleted)
+			if (!e.deleted && !e.incomplete)
 				list.setElementAt(e, i++);
 		}
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 406)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 407)
@@ -195,5 +195,5 @@
 	@Override public void visitBoundingBox(final BoundingXYVisitor v) {
 		for (final Node n : data.nodes)
-			if (!n.deleted)
+			if (!n.deleted && !n.incomplete)
 				v.visit(n);
 	}