php notice prevented
Merge branch 'hotfix/suppress-php-notice'
Merge tag 'suppress-php-notice' into develop

Small fix to remove notices