Added array bounds checks...