handle index related errors a bit better