More StopIteration tweaks

Signed-off-by: Paul Brook <paul@nowt.org>