A little further in fixing nullPointer