Exception handler crash fixing (Partial)