Merge "Cleanup how transport errors are handled in NN utils"