diff --git a/scripts/tests/e2/destroy.lua b/scripts/tests/e2/destroy.lua
index 430ca301c..db6f09c2a 100644
--- a/scripts/tests/e2/destroy.lua
+++ b/scripts/tests/e2/destroy.lua
@@ -41,8 +41,8 @@ function test_destroy_is_long()
     local u = unit.create(faction.create("human", "one@example.com", "de"), r1, 10)
     u.building = building.create(u.region, "castle")
     u:clear_orders()
-    u:add_order("LERNE Unterhaltung")
     u:add_order("ZERSTOERE " .. itoa36(u.building.id))
+    u:add_order("LERNE Unterhaltung")
     process_orders()
     assert_equal(0, u:get_skill("entertainment"))
     assert_equal(nil, u.building)
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;
                 }
             }