nullPointer fix