Merge "Check transport before registering."