Bug 14310 [QA Followup] - Deal with error conditions