fix exception when no current match exists
Merge branch 'Adar'