Another attempt to fix a npe.