prevent exceptions
index rework