NullPointer fix