Fix crash in "make html" introduced by the global env

Change-Id: Iece0e122841829d3561b71575065ffa7b656b504
Merge "Fix crash in "make html" introduced by the global env"