Addresses issue #290, and hopefully sets up things to allow generators throwing exceptions, etc.
Attach a file by drag & drop or click to upload
