Set iterator and currentObject to null if data is empty
Revert "Set iterator and currentObject to null if data is empty"

This reverts commit f6481dc84593c6a9ffa00a7d1009bfb4e41a5ec5.
Set iterator and currentObject to null if data is empty
Fixed conflict