Error handling for TC 4.9 added