diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 469961b52b..f562b188f7 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1094,7 +1094,7 @@ block.junction.description = Acts as a bridge for two crossing conveyor belts. U
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
 block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
-block.inverted-sorter.descriptions = Processes items like a standard sorter, but outputs selected items to the sides instead.
+block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
 block.router.description = Accepts items, then outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.\n\n[scarlet]Never use next to production inputs, as they will get clogged by output.[]
 block.distributor.description = An advanced router. Splits items to up to 7 other directions equally.
 block.overflow-gate.description = A combination splitter and router. Only outputs to the left and right if the front path is blocked.
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java
index 3bad2c3945..3f87d9e645 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConveyor.java
@@ -18,6 +18,7 @@ public class ArmoredConveyor extends Conveyor{
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
         return otherblock.outputsItems() && (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
-        || ((!otherblock.rotate && Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == tile.rotation()) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
+        || ((!otherblock.rotate && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
+            Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == tile.rotation()) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
     }
 }
diff --git a/fastlane/metadata/android/ja/full_description.txt b/fastlane/metadata/android/ja-JP/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/ja/full_description.txt
rename to fastlane/metadata/android/ja-JP/full_description.txt
diff --git a/fastlane/metadata/android/ja/short_description.txt b/fastlane/metadata/android/ja-JP/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/ja/short_description.txt
rename to fastlane/metadata/android/ja-JP/short_description.txt
diff --git a/fastlane/metadata/android/ja/title.txt b/fastlane/metadata/android/ja-JP/title.txt
similarity index 100%
rename from fastlane/metadata/android/ja/title.txt
rename to fastlane/metadata/android/ja-JP/title.txt
diff --git a/fastlane/metadata/android/ja/video.txt b/fastlane/metadata/android/ja-JP/video.txt
similarity index 100%
rename from fastlane/metadata/android/ja/video.txt
rename to fastlane/metadata/android/ja-JP/video.txt