Updated logic for rerun warning messages