RIC-1044: Add array size checks