Fix npe again