Small null point bug fix