Adding warning messages see BT#5572