some nullpointer prevention
commented