Fix #2 detecting returned handlers
Merge branch 'hotfix/return-from-closure-locators'