Fix/3.x/2648 npe startup