Added exception handling defect to TODO