php notice prevented
Merge branch 'hotfix/suppress-php-notice'