Catching a few PHP notices.
Merge branch 'phpnotices'

* phpnotices:
  Catching a few PHP notices.

Conflicts:
	inc/html.php