diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index 01200e87e3..0ff8fcbd28 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -588,14 +588,14 @@ namespace Avalonia.Controls
                 throw new AvaloniaInternalException("Cannot set ItemsSourceView during layout.");
             }
 
-            ItemsSourceView?.Dispose();
-            ItemsSourceView = newValue;
-
             if (oldValue != null)
             {
                 oldValue.CollectionChanged -= OnItemsSourceViewChanged;
             }
 
+            ItemsSourceView?.Dispose();
+            ItemsSourceView = newValue;
+
             if (newValue != null)
             {
                 newValue.CollectionChanged += OnItemsSourceViewChanged;
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index 5d80c860a7..d3aeefd088 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -52,11 +52,14 @@ namespace Avalonia.X11
 
             XInitThreads();
             Display = XOpenDisplay(IntPtr.Zero);
+            if (Display == IntPtr.Zero)
+                throw new Exception("XOpenDisplay failed");
             DeferredDisplay = XOpenDisplay(IntPtr.Zero);
+            if (DeferredDisplay == IntPtr.Zero)
+                throw new Exception("XOpenDisplay failed");
+                
             OrphanedWindow = XCreateSimpleWindow(Display, XDefaultRootWindow(Display), 0, 0, 1, 1, 0, IntPtr.Zero,
                 IntPtr.Zero);
-            if (Display == IntPtr.Zero)
-                throw new Exception("XOpenDisplay failed");
             XError.Init();
             
             Info = new X11Info(Display, DeferredDisplay, useXim);
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsRepeaterTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsRepeaterTests.cs
new file mode 100644
index 0000000000..321676abc0
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/ItemsRepeaterTests.cs
@@ -0,0 +1,24 @@
+using System.Collections.ObjectModel;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class ItemsRepeaterTests
+    {
+        [Fact]
+        public void Can_Reassign_Items()
+        {
+            var target = new ItemsRepeater();
+            target.Items = new ObservableCollection<string>();
+            target.Items = new ObservableCollection<string>();
+        }
+
+        [Fact]
+        public void Can_Reassign_Items_To_Null()
+        {
+            var target = new ItemsRepeater();
+            target.Items = new ObservableCollection<string>();
+            target.Items = null;
+        }
+    }
+}