Improved error handling
Merge branch 'master' of https://github.com/iclab/centinel-iclab