Case 2880 - Removed some PHP notices.
Merge branch 'case-2880' into develop

* case-2880:
  Case 2880 - Removed some PHP notices.