diff --git a/src/kernel/build.c b/src/kernel/build.c
index ff3993d79..871ccfc89 100644
--- a/src/kernel/build.c
+++ b/src/kernel/build.c
@@ -135,8 +135,10 @@ static void destroy_road(unit * u, int nmax, struct order *ord)
             else
                 road = (short)(road - willdo);
             rsetroad(r, d, road);
-            ADDMSG(&u->faction->msgs, msg_message("destroy_road",
-                "unit from to", u, r, r2));
+            if (willdo > 0) {
+                ADDMSG(&u->faction->msgs, msg_message("destroy_road",
+                    "unit from to", u, r, r2));
+            }
         }
     }
 }
diff --git a/src/kernel/build.test.c b/src/kernel/build.test.c
index 5ae8e299e..87cd359e0 100644
--- a/src/kernel/build.test.c
+++ b/src/kernel/build.test.c
@@ -3,6 +3,7 @@
 #include "alchemy.h"
 #include "types.h"
 #include "build.h"
+#include "guard.h"
 #include "order.h"
 #include "unit.h"
 #include "building.h"
@@ -281,10 +282,12 @@ static void test_build_destroy_road(CuTest *tc)
 
     CuAssertIntEquals(tc, 0, destroy_cmd(u, ord));
     CuAssertIntEquals(tc, 100, rroad(r, D_EAST));
+    CuAssertPtrEquals(tc, 0, test_find_messagetype(f->msgs, "destroy_road"));
 
     set_level(u, SK_ROAD_BUILDING, 1);
     CuAssertIntEquals(tc, 0, destroy_cmd(u, ord));
     CuAssertIntEquals(tc, 99, rroad(r, D_EAST));
+    CuAssertPtrNotNull(tc, test_find_messagetype(f->msgs, "destroy_road"));
 
     set_level(u, SK_ROAD_BUILDING, 4);
     CuAssertIntEquals(tc, 0, destroy_cmd(u, ord));
@@ -297,6 +300,54 @@ static void test_build_destroy_road(CuTest *tc)
     test_cleanup();
 }
 
+unit *test_create_guard(region *r, faction *f, race *rc) {
+    unit *ug;
+
+    if (!rc) {
+        rc = test_create_race("guardian");
+        rc->flags |= RCF_UNARMEDGUARD;
+    }
+    if (!f) {
+        f = test_create_faction(rc);
+    }
+    ug = test_create_unit(f, r);
+    guard(ug, GUARD_TAX);
+
+    return ug;
+}
+
+static void test_build_destroy_road_guard(CuTest *tc)
+{
+    region *r;
+    faction *f;
+    unit *u, *ug;
+    order *ord;
+
+    test_cleanup();
+    test_create_region(1, 0, 0);
+    r = test_create_region(0, 0, 0);
+    rsetroad(r, D_EAST, 100);
+    ug = test_create_guard(r, 0, 0);
+    u = test_create_unit(f = test_create_faction(0), r);
+    ord = create_order(K_DESTROY, f->locale, "%s %s", LOC(f->locale, parameters[P_ROAD]), LOC(f->locale, directions[D_EAST]));
+
+    set_level(u, SK_ROAD_BUILDING, 1);
+    CuAssertIntEquals(tc, 0, destroy_cmd(u, ord));
+    CuAssertIntEquals(tc, 100, rroad(r, D_EAST));
+    CuAssertPtrNotNull(tc, test_find_messagetype(f->msgs, "error70"));
+    CuAssertPtrEquals(tc, 0, test_find_messagetype(f->msgs, "destroy_road"));
+
+    test_clear_messages(f);
+    guard(ug, GUARD_NONE);
+
+    CuAssertIntEquals(tc, 0, destroy_cmd(u, ord));
+    CuAssertIntEquals(tc, 99, rroad(r, D_EAST));
+    CuAssertPtrEquals(tc, NULL, test_find_messagetype(f->msgs, "error70"));
+    CuAssertPtrNotNull(tc, test_find_messagetype(f->msgs, "destroy_road"));
+
+    test_cleanup();
+}
+
 CuSuite *get_build_suite(void)
 {
     CuSuite *suite = CuSuiteNew();
@@ -312,6 +363,7 @@ CuSuite *get_build_suite(void)
     SUITE_ADD_TEST(suite, test_build_building_with_golem);
     SUITE_ADD_TEST(suite, test_build_building_no_materials);
     SUITE_ADD_TEST(suite, test_build_destroy_road);
+    SUITE_ADD_TEST(suite, test_build_destroy_road_guard);
     return suite;
 }