Improve handler `require` logic
Discussion:
!33 (comment 636231)