Add constructor check. Also add null check before calling
updateTableIndexes