Fix svace issue to nullcheck