emergency commit: restore latest changes
hotfix error messages
Merge pull request #41 from dupps/master

restore error messages
Merge pull request #7 from cbos-team/master

hotfix error messages