Imporve the handling for "We got a warning"