Improve some error management code in CT