Just a note that the token check you mention will be part of the fix I already have planned for bug 973612.
Just a note that the token check you mention will be part of the fix I already have planned for bug 973612.