fail if currency not there (bug 871839)
Merge branch 'andym-871839'