more verbose error handling
Merge branch 'master' of git.creatis.insa-lyon.fr:desk