Fixed certificate null object issue in develop branch