Handle non matches correctly