Updated error message
Merge remote-tracking branch 'devel/mac_fixes' into devel-master

* devel/mac_fixes:
  Updated error message