Error handling for TC 4.8 implemented