Fix #800 (and add error msg in a nasty catch and ignore)

Making #801 up-to-date for a merge.