Added missing exception handler