diff --git a/src/xtd.core/src/xtd/collections/bit_array.cpp b/src/xtd.core/src/xtd/collections/bit_array.cpp
index 09455b16ca7..6e90e2b1375 100644
--- a/src/xtd.core/src/xtd/collections/bit_array.cpp
+++ b/src/xtd.core/src/xtd/collections/bit_array.cpp
@@ -230,6 +230,7 @@ bit_array& bit_array::right_shift(xtd::size count) noexcept {
 
 void bit_array::set(size index, bool value) {
   flush(); // Must be call first
+  if (index >= length()) throw argument_out_of_range_exception {};
   set_bit_value(index, value);
 }