diff -r 8c40d4419e70 -r d5edb0ae8f2a mapeditor.cpp
--- a/mapeditor.cpp	Thu Aug 07 14:41:17 2008 +0000
+++ b/mapeditor.cpp	Sun Oct 05 09:15:00 2008 +0000
@@ -3685,6 +3685,17 @@
 	if (bo)
 	{
 		par=(BranchObj*)(bo->getParObj());
+
+		// Don't use this on mapcenter
+		if (!par) return;
+
+		// Check if we have childs at all to keep
+		if (bo->countBranches()==0) 
+		{
+			deleteSelection();
+			return;
+		}
+
 		QPointF p=bo->getRelPos();
 		saveStateChangingPart(
 			bo->getParObj(),