Should fix an npe