Fix for "TypeError: 'NoneType' object is unsubscriptable" in Indexer API code