Fix sending null