fix compile errors introduced in last, more error handling cleanup

--HG--
branch : HEAD
7 files changed