fix overly aggressive assert; allow None
Merge pull request #1142 from ifreecarve/2013-05-30_fix_assert

fix overly aggressive assert; allow None