Fixed nullPointer