Don't choke on null variants.  Fix for issue #8.