Add safety against possible notice