Better timeout handling i ActivityTask#run