Take 2 on some PHP error fixes.
Merge pull request #26 from methnen/php-errors

A couple of small tweaks to prevent some PHP errors.