DT Service nullpointer temp crashfix
Will add proper fix later