diff --git a/changes/bug20389 b/changes/bug20389
new file mode 100644
index 0000000000..8f1b9f5e03
--- /dev/null
+++ b/changes/bug20389
@@ -0,0 +1,4 @@
+  o Minor features (controller):
+    - When HSFETCH arguments cannot be parsed, say "Invalid argument"
+      rather than "unrecognized." Closes ticket 20389; patch from
+      Ivan Markin.