fixed bug introduced by recent error message commit
Merge branch 'master' into CAPER