Fix one potential cause of the Null