Checking if a block is given before we yield the user

This bug caused the find command to fail
Merge branch 'fix/no-block-yield'