Fix/3.m/2648 npe startup