diff --git a/src/wordsplit.c b/src/wordsplit.c
index 4e633fa..af747b3 100644
--- a/src/wordsplit.c
+++ b/src/wordsplit.c
@@ -837,7 +837,7 @@ wordsplit_finish (struct wordsplit *wsp)
 	    }
 	  else
 	    {
-	      wsp->ws_error = WRDSE_EOF;
+	      wsp->ws_errno = WRDSE_EOF;
 	      return WRDSE_EOF;
 	    }
 	  goto again;
@@ -1163,7 +1163,7 @@ wsplt_assign_param (struct wordsplit *wsp, int param_idx, char *value)
   char *v;
 
   if (param_idx < 0)
-    return WRDSE_BADPARAM;
+    return _wsplt_seterr (wsp, WRDSE_BADPARAM);
   if (param_idx == wsp->ws_paramc)
     {
       char **parambuf;
@@ -1210,7 +1210,7 @@ wsplt_assign_param (struct wordsplit *wsp, int param_idx, char *value)
       wsp->ws_paramc = param_idx + 1;
     }
   else if (param_idx > wsp->ws_paramc)
-    return WRDSE_BADPARAM;
+    return _wsplt_seterr (wsp, WRDSE_BADPARAM);
 
   v = strdup (value);
   if (!v)