diff --git a/src/vim9execute.c b/src/vim9execute.c
index 398c94c..c910dbc 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1169,12 +1169,12 @@
 			n = tv->vval.v_number;
 		    msg = set_option_value(iptr->isn_arg.storeopt.so_name,
 					n, s, iptr->isn_arg.storeopt.so_flags);
+		    clear_tv(tv);
 		    if (msg != NULL)
 		    {
 			emsg(_(msg));
 			goto failed;
 		    }
-		    clear_tv(tv);
 		}
 		break;