Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 2999)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 3000)
@@ -275,4 +275,6 @@
             if (parent == null)
                 return null;
+            if (parent.children == null)
+                return null;
             int __nr = 0;
             for (QBLevel sibling : parent.children) {
@@ -932,5 +934,5 @@
             //    an element
             content_index--;
-            T object = peek(); //TODO Is the call to peek() necessary?
+            T object = peek();
             current_node.remove_content(object);
         }