[PATCH] avoid masking exceptions in retry code