Improved error messages
Merge branch 'master' into gb_master