Fix null issue for the last release