case 2476 - Refactored error handling.