Merge pull request #4742 from cartender/pr/fix_try_catch_poll__master