Working on error handling for TC 4.8