diff --git a/handbook/survey/caveentry.html b/handbook/survey/caveentry.html
index 30a2bbcec..4ff33ae4f 100644
--- a/handbook/survey/caveentry.html
+++ b/handbook/survey/caveentry.html
@@ -153,6 +153,13 @@ So each field you fill in on the form may contain arbitrary HTML. Be careful!</p
 <h2>List of New Cave/Cave_data fields</h2>
 <p>The full list of fields is documented: <a href="caveentryfields.html">the full list of data-entry fields</a> when creating a cave.
 
+  <h2>If things go wrong</h2>
+<p>Tell a nerd, or post to the "expo" Signal group, or the Matrix "Website" room <em>immediately</em>. A broken edit can block all the forms working on the website: for Caves, Entrances, Logbook entries, Handbook edits.
+  <h3>Tidying up and committing broken edits</h3>
+'Edit This Cave' (or Entrance) edits the file served on the web, saves it on the server, adds it to the list of proposed git updates, then finally does the git 'commit' on the server. Things can sometimes go wrong at each step of the process.
+<p>
+Specific error message pages are produced if the file cannot be saved (usually a permissions error), if it cannot be added to git's list, or if the git commit fails (which would be due to a merge failure on a previous commit attempt).
+  <p>If you see an error <em>do not ignore it</em>, post the error message to one of the communication channels (Signal or Matrix) at once.
   <hr />
   <p>Back to the previous page in this sequence <a href="newrig.html">New rigging guide</a>.
   <br />A side trip to see an explantion of all  <a href="caveentryfields.html">the fields on the form</a>