Index: src/reverter/ChangesetReverter.java
===================================================================
--- src/reverter/ChangesetReverter.java	(revision 36446)
+++ src/reverter/ChangesetReverter.java	(working copy)
@@ -380,8 +380,12 @@
             return true;
         // Handle case where a deleted note has been restored to avoid false conflicts (fix #josm8660)
         if (currentCoor != null && historyCoor == null) {
-            LatLon previousCoor = ((Node) nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
-            return previousCoor != null && previousCoor.equals(currentCoor);
+        	if (nds.getPrimitiveById(history.getPrimitiveId()) == null)
+        		return false;
+        	if (nds.getPrimitiveById(history.getPrimitiveId()) != null) {
+        		LatLon previousCoor = ((Node) nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
+        		return previousCoor != null && previousCoor.equals(currentCoor);
+        	}
         }
         return false;
     }