DS-441 Fixes PHP notices
Merge pull request #3123 from aaronschachter/DS-441-php-notice

DS-441 Fixes PHP notices