Fixes CHECK_NULLPTR issues