fix error
Merge branch 'hotfix/fix.error.handling'