Hotfix/collection count

Fix to allow for collections which report the wrong size, the collection will be processed until the data is not valid. Eg null.