Remove redundent check (if span is null, then div will be null, so only need to check for div).  Issue #730.