Update handle case where there is no match