fix exception when no current match exists