Fixed a nullPointer