Please review: Bug 611850 - fix coverity Defect Type: Error handling issues