Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 569)
+++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 570)
@@ -207,4 +207,8 @@
 				&& wayChunks.get(0).get(0) == lastWayChunk.get(lastWayChunk.size() - 1)
 				&& !nodeSet.contains(wayChunks.get(0).get(0))) {
+			if (wayChunks.size() == 2) {
+				JOptionPane.showMessageDialog(Main.parent, tr("You must select two or more nodes to split a circular way."));
+				return;
+			}
 			lastWayChunk.remove(lastWayChunk.size() - 1);
 			lastWayChunk.addAll(wayChunks.get(0));