Fixed Bug causing editing of null scene.  Issue 3044