Please Review: (630096) fix coverity Defect Type: Error handling issues