#1004: handle some bad recurrences nicely

This closes #1004.

@hjoliver, please review.