Allow no match to be found to avoid throwing an exception (#3188)

Allow no match to be found to avoid throwing an exception (#3188) #931