diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c
index 4d0b1a534..b6e796a29 100644
--- a/src/mapper/map_units.c
+++ b/src/mapper/map_units.c
@@ -1241,15 +1241,17 @@ showunits(region * r)
 						break;
 					case '\023':
 						sh = findship(f);
-						sprintf(lbuf, "Einheit auf%s als Eigner?", shipname(sh));
-						if (yes_no(0, lbuf, 'j')) {
-							for (x = r->units; x; x = x->next)
-								if (x->ship == sh && fval(x, FL_OWNER)) {
-									freset(x, FL_OWNER);
-									break;
-								}
-							u->ship = sh;
-							fset(u, FL_OWNER);
+						if (sh) {
+							sprintf(lbuf, "Einheit auf%s als Eigner?", shipname(sh));
+							if (yes_no(0, lbuf, 'j')) {
+								for (x = r->units; x; x = x->next)
+									if (x->ship == sh && fval(x, FL_OWNER)) {
+										freset(x, FL_OWNER);
+										break;
+									}
+								u->ship = sh;
+								fset(u, FL_OWNER);
+							}
 						}
 						break;
 					case '\025':
diff --git a/src/res/tutorial.xml b/src/res/tutorial.xml
index ac50f83d0..285518a4c 100644
--- a/src/res/tutorial.xml
+++ b/src/res/tutorial.xml
@@ -12,10 +12,10 @@
 	<include file="ships.xml"></include>
 	<include file="buildings.xml"></include>
 
-	<game name="Eressea" welcome="tutorial">
+	<game name="Tutorial" welcome="tutorial">
 		<comment>Game specific</comment>
-		<order name="MEINUNG" disable></order>
 		<order name="EMAIL" disable></order>
+		<order name="MEINUNG" disable></order>
 		<order name="MAGIEGEBIET" disable></order>
 	</game>
 	<include file="tutorial/de/strings.xml"></include>