v0.9.13 - Improved error management