diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 92c9843b4e..32717544f6 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -192,7 +192,7 @@ int main(int argc, char ** argv)
       FLAGS_calc_statistics || FLAGS_type_statistics || FLAGS_dump_types || FLAGS_dump_prefixes ||
       FLAGS_dump_feature_names != "" || FLAGS_check_mwm || FLAGS_srtm_path != "" ||
       FLAGS_make_routing_index || FLAGS_make_cross_mwm || FLAGS_generate_traffic_keys ||
-      FLAGS_transit_path != "")
+      FLAGS_transit_path != "" || FLAGS_ugc_data != "")
   {
     classificator::Load();
     classif().SortClassificator();
diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh
index 848e64671e..6de79d69b5 100755
--- a/tools/unix/generate_planet.sh
+++ b/tools/unix/generate_planet.sh
@@ -359,11 +359,15 @@ if [ "$MODE" == "coast" ]; then
     if [ -n "$OPT_UPDATE" ]; then
       log "STATUS" "Step 1: Updating the planet file $PLANET"
       PLANET_ABS="$(cd "$(dirname "$PLANET")"; pwd)/$(basename "$PLANET")"
+      OSC_ABS="$(cd "$(dirname "$OSC")"; pwd)/$(basename "$OSC")"
       (
         cd "$OSMCTOOLS" # osmupdate requires osmconvert in a current directory
         ./osmupdate --drop-author --drop-version --out-o5m -v "$PLANET_ABS" "$PLANET_ABS.new.o5m"
-        if [ -f "${OSC-}" ]; then
-          ./osmconvert "$PLANET_ABS.new.o5m" "$OSC" -o="$PLANET_ABS.merged.o5m"
+        if [ -f "${OSC_ABS-}" ]; then
+          # Backup the planet first
+          mv "$PLANET_ABS" "$PLANET_ABS.backup"
+          log "WARNING" "Altering the planet file with $OSC, restore it from $PLANET_ABS.backup"
+          ./osmconvert "$PLANET_ABS.new.o5m" "$OSC_ABS" -o="$PLANET_ABS.merged.o5m"
           mv -f "$PLANET_ABS.merged.o5m" "$PLANET_ABS.new.o5m"
         fi
       ) >> "$PLANET_LOG" 2>&1