Deal with bad StopIteration errors (v0.4.1)