--- a/UIObjectView.st	Mon Jul 18 17:26:21 2011 +0200
+++ b/UIObjectView.st	Mon Jul 25 17:31:32 2011 +0200
@@ -842,16 +842,19 @@
 
     anObject notNil ifTrue:[
         org := anObject computeOrigin.
-
-        delta := aPoint - org.
-        delta := (self alignToGrid:aPoint) - org.
-        dX := delta x.
-        dY := delta y.
-
-        undoHistory withoutTransactionDo:[
-            self shiftLayout:anObject horizontal:dX vertical:dY
+        org notNil ifTrue:[
+            delta := aPoint - org.
+            delta := (self alignToGrid:aPoint) - org.
+            dX := delta x.
+            dY := delta y.
+
+            undoHistory withoutTransactionDo:[
+                self shiftLayout:anObject horizontal:dX vertical:dY
+            ]
         ]
     ]
+
+    "Modified: / 25-07-2011 / 17:27:08 / cg"
 !
 
 startObjectMoveAt:aPoint