Made changes to handle cancelled tasks in AutoTransport

#2178