one more fix to nullpointerexception