Ensure that we only try to rerun messages if they are present