Collision detector now catches index not found error, cleanup