CS fix
if handler_id is identical to null fix
minor #9520 CS fix (peterkokot)

This PR was merged into the 2.2 branch.

Discussion
----------

CS fix

Commits
-------

f348731 CS fix
minor #9521 CS fix (peterkokot)

This PR was merged into the 2.2 branch.

Discussion
----------

CS fix

I hope this is not BC break though handler_id checking should be done with identical comparison operator I believe.

Commits
-------

1b6b1e9 if handler_id is identical to null fix