Bug when loading a listing that contains only a few items

Found a bug in the new code and provided a fix, I needed this for a use case I was working on. The test I performed was loading comments for a user that e.g. only has 2 comments. With the current implementation the system got in a loop. I think the fix I provided covers all cases. I tried to keep to the same coding standards as used in the rest of the code, no blank lines :-) Thanks, and a nice implementation btw.