fix overly aggressive assert; allow None