adding more descriptive error message
Merge remote-tracking branch 'origin/master' into devel