In the process of fixing some null value xmit issues.