Are you sure we want to remove this entry if there is an error? I can understand removing if it's NOT_FOUND, but I'm not sure it's right to remove upon any other error.