Allow no match to be found to avoid throwing an exception

Allow no match to be found to avoid throwing an exception #954