[PATCH] IDE error handling fixes