diff --git a/src/xmpp/adhoc_command.cpp b/src/xmpp/adhoc_command.cpp
index 419c3ae282183b486229d898da6eaf2b2deca53a..67bc706771247ad1357ef1ce831f4b033a3700ee 100644
--- a/src/xmpp/adhoc_command.cpp
+++ b/src/xmpp/adhoc_command.cpp
@@ -83,9 +83,14 @@ void HelloStep2(XmppComponent*, AdhocSession& session, XmlNode& command_node)
             }
         }
     }
-  // TODO insert an error telling the name value is missing.  Also it's
-  // useless to terminate it, since this step is the last of the command
-  // anyway. But this is for the example.
+  command_node.delete_all_children();
+  XmlNode error(ADHOC_NS":error");
+  error["type"] = "modify";
+  XmlNode condition(STANZA_NS":bad-request");
+  condition.close();
+  error.add_child(std::move(condition));
+  error.close();
+  command_node.add_child(std::move(error));
   session.terminate();
 }
 
@@ -182,7 +187,13 @@ void DisconnectUserStep2(XmppComponent* xmpp_component, AdhocSession& session, X
           command_node.add_child(std::move(note));
         }
     }
-  // TODO insert an error telling the values are missing.
+  XmlNode error(ADHOC_NS":error");
+  error["type"] = "modify";
+  XmlNode condition(STANZA_NS":bad-request");
+  condition.close();
+  error.add_child(std::move(condition));
+  error.close();
+  command_node.add_child(std::move(error));
   session.terminate();
 }