diff --git a/src/eval.c b/src/eval.c
index 793a526..90ed14b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6801,7 +6801,7 @@
 	// If it's still empty it was changed and restored, need to restore in
 	// the complicated way.
 	if (*p_cpo == NUL)
-	    set_option_value((char_u *)"cpo", 0L, save_cpo, 0);
+	    set_option_value_give_err((char_u *)"cpo", 0L, save_cpo, 0);
 	free_string_option(save_cpo);
     }