diff --git a/src/Perspex.Layout/LayoutManager.cs b/src/Perspex.Layout/LayoutManager.cs index 8b4e605fe4..f1c45693ab 100644 --- a/src/Perspex.Layout/LayoutManager.cs +++ b/src/Perspex.Layout/LayoutManager.cs @@ -276,12 +276,12 @@ namespace Perspex.Layout { var control = item.Control; - while (control.PreviousArrange == null) + while (control != null && control.PreviousArrange == null) { control = control.GetVisualParent(); } - if (control.GetVisualRoot() == Root) + if (control != null && control.GetVisualRoot() == Root) { control.Arrange(control.PreviousArrange.Value, true); }