Modified error handling to pass back original error message along with description string