diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh
index 57da3c417b..0d05c2a8ae 100755
--- a/tools/unix/generate_planet.sh
+++ b/tools/unix/generate_planet.sh
@@ -114,6 +114,7 @@ PLANET="${PLANET:-$HOME/planet/planet-latest.o5m}"
 OMIM_PATH="${OMIM_PATH:-$(cd "$(dirname "$0")/../.."; pwd)}"
 DATA_PATH="$OMIM_PATH/data"
 [ ! -r "${DATA_PATH}/types.txt" ] && fail "Cannot find classificators in $DATA_PATH, please set correct OMIM_PATH"
+[ -n "$OPT_ROUTING" -a ! -f "$HOME/.stxxl" ] && fail "For routing, you need ~/.stxxl file. Run this: echo 'disk=$HOME/stxxl_disk1,400G,syscall' > $HOME/.stxxl"
 TARGET="${TARGET:-$DATA_PATH}"
 mkdir -p "$TARGET"
 INTDIR="${INTDIR:-$TARGET/intermediate_data}"
@@ -318,9 +319,7 @@ if [ "$MODE" == "mwm" ]; then
   PARAMS_WITH_SEARCH="$PARAMS -generate_search_index"
   for file in "$TARGET"/*.mwm.tmp; do
     if [[ "$file" != *minsk-pass* && "$file" != *World* ]]; then
-      filename="$(basename "$file")"
-      filename="${filename%.*.*}"
-      "$GENERATOR_TOOL" $PARAMS_WITH_SEARCH --output="$filename" 2>> "$GENERATOR_LOG" &
+      "$GENERATOR_TOOL" $PARAMS_WITH_SEARCH --output="$(basename "$file" .mwm.tmp)" 2>> "$GENERATOR_LOG" &
       forky
     fi
   done
diff --git a/tools/unix/generate_planet_routing.sh b/tools/unix/generate_planet_routing.sh
index 3a0d5b5582..590e9f0ee3 100755
--- a/tools/unix/generate_planet_routing.sh
+++ b/tools/unix/generate_planet_routing.sh
@@ -73,8 +73,9 @@ elif [ "$1" == "prepare" ]; then
   PROFILE="${PROFILE:-$OSRM_PATH/profiles/car.lua}"
   [ $# -gt 1 ] && PROFILE="$2"
   [ ! -r "$PROFILE" ] && fail "Lua profile $PROFILE is not found"
-
   export STXXLCFG="$HOME/.stxxl"
+  [ ! -f "$STXXLCFG" ] && fail "For routing, you need ~/.stxxl file. Run this: echo 'disk=$HOME/stxxl_disk1,400G,syscall' > $STXXLCFG"
+
   for PBF in "$INTDIR"/*.pbf; do
     OSRM_FILE="${PBF%.*}.osrm"
     RESTRICTIONS_FILE="$OSRM_FILE.restrictions"