Fixed npe again