[mgaunard]

I don't know enough about APE or cosmo to know how risky the changes are.

Here apparently the changes are mostly related to error handling, and I guess that's not something that's very well tested with normal usage.