#25576 - Fixed issue where residual properties crashed the indexer