ISPN-4630 DistributedEntryRetriever throws NPE if iterator is closed
before processing all responses

* Fixed up a few more spots that were missed in initial commit