case 2395 - Added proper checks.
Merge branch 'case-2395' into develop

* case-2395:
  case 2395 - Added proper checks.