added extra warning messages