Fixing error messages see BT#6916