diff --git a/src/move.c b/src/move.c
index c33067098..21c173106 100644
--- a/src/move.c
+++ b/src/move.c
@@ -633,7 +633,7 @@ void move_ship(ship * sh, region * from, region * to, region_list * route)
         leave_trail(sh, from, route);
     }
 
-    if (route != NULL) {
+    if (route != NULL && from->units) {
         unit** iunit = &from->units;
         unit** ulist = &to->units;
         unit* ufirst = NULL;
@@ -658,9 +658,6 @@ void move_ship(ship * sh, region * from, region * to, region_list * route)
                     produceexp(u, SK_SAILING, u->number);
                 }
             }
-            else if (ufirst) {
-                break;
-            }
             else {
                 iunit = &u->next;
             }