should hopefully fix 1 npe.