HAP-442 - Fixing the Exception logs