Added a couple of checks for table_index; stop-gap until change form of declaration.
Authored by: dwarren 2019-10-01
Parent: [r9656]
Child: [r9658]