Revert "Raise exception if expected match ID is nil"

This reverts commit 75c24add5328a533590297ad35be2e3ab16483cd.