Merge pull request #215 from poupotte/master

Improve controller error management
1.0.26