Case 2844 - Added some checks.
Merge branch 'case-2844' into develop

* case-2844:
  Case 2844 - Added some checks.