Improve plot warning mechanism