The null check is being done in the TransportHelper, but I agree that it would be better here.