Merge branch 'hotfix/0.6.1'
Merge branch 'develop'
Fix wrong error message.
Merge branch 'hotfix/0.6.2' into develop