Add checks for indexes (cp. issue #206, amends commit 8002559)