diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index f4adf3f72..1823f1004 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -1324,7 +1324,7 @@ int ArrayCtrl::GetSelectCount() const
 
 void ArrayCtrl::Select(int i, bool sel)
 {
-	array[i].select = sel;
+	array.At(i).select = sel;
 	selectiondirty = true;
 	RefreshRow(i);
 	WhenSelection();
diff --git a/uppsrc/CtrlLib/ArrayCtrl.h b/uppsrc/CtrlLib/ArrayCtrl.h
index bd80dad8e..00fad8839 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.h
+++ b/uppsrc/CtrlLib/ArrayCtrl.h
@@ -410,7 +410,7 @@ public:
 	bool       IsSelection() const                              { return GetSelectCount(); }
 	void       Select(int i, bool sel = true);
 	void       Select(int i, int count, bool sel = true);
-	bool       IsSelected(int i) const                          { return array[i].select; }
+	bool       IsSelected(int i) const                          { return i < array.GetCount() && array[i].select; }
 	void       ClearSelection();
 	bool       IsSel(int i) const;