add error handling
refactoring
Merge branch 'devel'