fixed three nullpointers