diff --git a/src/give.c b/src/give.c
index ff1a3ac03..8f352ccbb 100644
--- a/src/give.c
+++ b/src/give.c
@@ -796,6 +796,9 @@ static void give_all_items(unit *u, unit *u2, order *ord) {
                     }
                 }
             }
+            else {
+                cmistake(u, ord, 123, MSG_COMMERCE);
+            }
         }
     }
 }
diff --git a/src/laws.c b/src/laws.c
index b00da467c..fc1c8dc88 100644
--- a/src/laws.c
+++ b/src/laws.c
@@ -3091,14 +3091,7 @@ void update_long_order(unit * u)
                     }
                     break;
                 default:
-                    if (kwd > thiskwd) {
-                        /* swap out thisorder for the new one */
-                        cmistake(u, u->thisorder, 52, MSG_EVENT);
-                        set_order(&u->thisorder, copy_order(ord));
-                    }
-                    else {
-                        cmistake(u, ord, 52, MSG_EVENT);
-                    }
+                    cmistake(u, ord, 52, MSG_EVENT);
                     break;
                 }
             }