Reduce code duplication

[GulsahKose]

Follow-up commit 2acc5a94c9d883d1dc92ca52cb9a92116d177009

Move the "if exist" conditions into event handler

Change-Id: Iefdb36d95f53af79dcc3e7694a68e5cac3b1dfa1

• Resolves: #
• Target version: master

Summary

TODO

• [ ] ...

Checklist

• [ ] Code is properly formatted
• [ ] All commits have Change-Id
• [ ] I have run tests with make check
• [ ] I have issued make run and manually verified that everything looks okay
• [ ] Documentation (manuals or wiki) has been updated or is not required