Another PHP notice
Merge branch 'php_errors'