Fix html2html crashers introduced by 6e402568

* I had fixed this but must have accidentally reverted the fix
  after I finished my testing while working on 6e402568.

Change-Id: I01257fefee0ce3348c3d2f333c4c8bdfbdc46621