From: 	Willem Riede <osst@riede.org>

important error handling improvements that I've made as the result of
problem reports.
signed-off-by: Willem Riede <osst@riede.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>