Handle extra warnings more grecefully