[ artf697884] null pointer exception fixed