FIX: Better warning catching