Fix ServerDataHander to handle null data correctly