Correct way of catching non-existing messages.
Revert "Revert "CHANGES""

This reverts commit 235b6444e17f471d0068ef2f4d98d531a40f3ff8.