Added processing of exception