diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index fe62b5e72..7f2073632 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -359,11 +359,6 @@ destroy_cmd(unit * u, struct order * ord)
     return 0;
   }
 
-  if (!fval(u, UFL_OWNER)) {
-    cmistake(u, ord, 138, MSG_PRODUCE);
-    return 0;
-  }
-
   if (s && *s) {
     n = atoi(s);
     if(n <= 0) {
@@ -377,6 +372,11 @@ destroy_cmd(unit * u, struct order * ord)
     return 0;
   }
 
+  if (!fval(u, UFL_OWNER)) {
+    cmistake(u, ord, 138, MSG_PRODUCE);
+    return 0;
+  }
+
   if (u->building) {
     building *b = u->building;
     if (a_find(b->attribs, &at_nodestroy)) {