diff --git a/src/gamecode/economy.c b/src/gamecode/economy.c
index 0c4110401..84bd59144 100644
--- a/src/gamecode/economy.c
+++ b/src/gamecode/economy.c
@@ -654,7 +654,7 @@ give_control_cmd(unit * u, order * ord)
   if (p == P_CONTROL) {
     message * msg;
 
-    if (!u2) {
+    if (!u2 || u2->number==0) {
       ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_unit_not_found", ""));
     }
     else if (!u->building && !u->ship) {