Adding error messages
Merge branch 'master' into eecg