Add exception handle part