Fixed an issue where a non-match was throwing an Exception