adjust safety checks on scrub msgs a bit