Merge pull request #16110 from Mashimiao/daemon-create-fix-return-and-adjust

before adjusting should check whether need return or not