Index: trunk/src/obj_pstk_op.c
===================================================================
--- trunk/src/obj_pstk_op.c	(revision 16102)
+++ trunk/src/obj_pstk_op.c	(revision 16103)
@@ -209,7 +209,8 @@
 
 		pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
 		pcb_pstk_invalidate_erase(ps);
-		pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+		if (ps->parent.data->padstack_tree != NULL)
+			pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
 
 		pcb_rotate(&nx, &ny, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
 		if ((nx != ps->x) || (ny != ps->y))
@@ -216,7 +217,8 @@
 			pcb_pstk_move_(ps, nx - ps->x, ny - ps->y);
 
 		pcb_pstk_bbox(ps);
-		pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+		if (ps->parent.data->padstack_tree != NULL)
+			pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
 		pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
 		pcb_pstk_invalidate_draw(ps);
 
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 16102)
+++ trunk/src/obj_text.c	(revision 16103)
@@ -639,9 +639,11 @@
 {
 	pcb_text_invalidate_erase(Layer, Text);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
-	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+	if (Layer->text_tree != NULL)
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 	pcb_text_rotate90(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
-	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+	if (Layer->text_tree != NULL)
+		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
 	pcb_text_invalidate_draw(Layer, Text);
 	return Text;