Added exception when no match can be found