Exception model updated