diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 88fd0c24a..e93adf228 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -3275,7 +3275,7 @@ new_units (void)
 
             g = getguard(u);
             if (g) setguard(u2, g);
-            else setguard(u, GUARD_NONE);
+            /* else setguard(u2, GUARD_NONE); */
 
             ordp = &makeord->next;
             newordersp = &u2->orders;
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 13c89cf09..60bddac71 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -2432,6 +2432,7 @@ setguard(unit * u, unsigned int flags)
 {
   /* setzt die guard-flags der Einheit */
   attrib * a = NULL;
+  assert(flags==0 || !fval(u, UFL_MOVED));
   if (fval(u, UFL_GUARD)) {
     a = a_find(u->attribs, &at_guard);
   }