--- old/modules/graphics/src/main/java/javafx/stage/Stage.java	2015-03-03 17:17:51.968606811 +0200
+++ new/modules/graphics/src/main/java/javafx/stage/Stage.java	2015-03-03 17:17:51.120182796 +0200
@@ -554,10 +554,9 @@
             throw new IllegalStateException("Cannot set owner for the primary stage");
         }
 
-        this.owner = owner;
-        
         final Scene sceneValue = getScene();
         if (sceneValue != null) {
+            this.owner = owner;
             SceneHelper.parentEffectiveOrientationInvalidated(sceneValue);
         }
     }