case 2476 - Added logging.
case 2476 - Refactored error handling.
case 2476 - Fixed CR.
Merge branch 'case-2476' into develop

* case-2476:
  case 2476 - Fixed CR.
  case 2476 - Refactored error handling.
  case 2476 - Added logging.