diff --git a/src/Eto.Wpf/Forms/Controls/GridHandler.cs b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
index e6b42dc1b..0d0f7e613 100755
--- a/src/Eto.Wpf/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
@@ -642,7 +642,12 @@ public IEnumerable<int> SelectedRows
 						Control.SelectedItems.Clear();
 						foreach (int row in value)
 						{
-							Control.SelectedItems.Add(list[row]);
+							// protect against any incorrect info
+							if (row >= list.Count)
+								continue;
+							var item = list[row];
+							if (item != null)
+								Control.SelectedItems.Add(item);
 						}
 
 						Control.EndUpdateSelectedItems();