Add missing exception handler