From 6cab63fb7046d8d0ddb6c79d46310a709cc798ac Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 24 May 2016 19:31:19 +0200
Subject: [PATCH] Don't try to dematerialize null containers.

---
 src/Avalonia.Controls/Generators/ItemContainerGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index b5c176cf33..bbbe8528b4 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -73,7 +73,7 @@ namespace Avalonia.Controls.Generators
 
             for (int i = startingIndex; i < startingIndex + count; ++i)
             {
-                if (i < _containers.Count)
+                if (i < _containers.Count &&_containers[i] != null)
                 {
                     result.Add(_containers[i]);
                     _containers[i] = null;