updated the patch. I move TException in to comment (wanted to make it clear that TException is the 'right' one to catch, but we have to catch the rest as well).