Integrate better with the warning messages that are already there