-fixed nullpointerexception