Made transport selection persistent.

// FREEBIE
Added forgotten non-null check

// FREEBIE