Explicitly handle StopIteration when calling next
Explicitly handle StopIteration when calling next

I think this is the safer variant for handling manually incrementing an
iterator. I'm not sure how this was working in the first palce though...

MjnMixael/knossos,MjnMixael/knossos,MjnMixael/knossos,MjnMixael/knossos,MjnMixael/knossos