diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java
index 1ca7207ba..93943d6be 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java
@@ -27,7 +27,6 @@ import net.minecraftforge.fml.common.Mod;
 import org.lwjgl.glfw.GLFW;
 
 import java.text.DecimalFormat;
-import java.util.Objects;
 
 import static net.mcreator.superbwarfare.client.RenderHelper.preciseBlit;
 
@@ -44,81 +43,85 @@ public class CannonHudOverlay {
         int w = event.getWindow().getGuiScaledWidth();
         int h = event.getWindow().getGuiScaledHeight();
         Player player = Minecraft.getInstance().player;
+
+        if (!shouldRenderCrossHair(player)) return;
+
+        Entity cannon = player.getVehicle();
+        if (cannon == null) return;
+
         RenderSystem.disableDepthTest();
         RenderSystem.depthMask(false);
         RenderSystem.enableBlend();
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
         RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
         RenderSystem.setShaderColor(1, 1, 1, 1);
-        if (shouldRenderCrossHair(player)) {
-            Entity cannon = Objects.requireNonNull(player.getVehicle());
-            float yRotOffset = Mth.lerp(event.getPartialTick(), player.yRotO, player.getYRot());
-            float xRotOffset = Mth.lerp(event.getPartialTick(), player.xRotO, player.getXRot());
-            float diffY = cannon.getViewYRot(event.getPartialTick()) - yRotOffset;
-            float diffX = cannon.getViewXRot(event.getPartialTick()) - xRotOffset + 1.3f;
-            float fovAdjust = (float) 70 / Minecraft.getInstance().options.fov().get();
-            if (diffY > 180.0f) {
-                diffY -= 360.0f;
-            } else if (diffY < -180.0f) {
-                diffY += 360.0f;
-            }
-            float f = (float) Math.min(w, h);
-            float f1 = Math.min((float) w / f, (float) h / f) * fovAdjust;
-            int i = Mth.floor(f * f1);
-            int j = Mth.floor(f * f1);
-            int k = (w - i) / 2;
-            int l = (h - j) / 2;
-            if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
-                Entity lookingEntity = TraceTool.findLookingEntity(player, 512);
-                boolean lookAtEntity = false;
-                double block_range = player.position().distanceTo((Vec3.atLowerCornerOf(player.level().clip(
-                        new ClipContext(player.getEyePosition(), player.getEyePosition().add(player.getLookAngle().scale(512)),
-                                ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos())));
 
-                double entity_range = 0;
-
-
-                if (lookingEntity instanceof LivingEntity living) {
-                    lookAtEntity = true;
-                    entity_range = player.distanceTo(living);
-                }
-                if (lookAtEntity) {
-                    event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("des.superbwarfare.drone.range")
-                                    .append(Component.literal(new DecimalFormat("##.#").format(entity_range) + "M " + lookingEntity.getDisplayName().getString())),
-                            w / 2 + 14, h / 2 - 20, -1, false);
-                } else {
-                    if (block_range > 511) {
-                        event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("des.superbwarfare.drone.range")
-                                .append(Component.literal("---M")), w / 2 + 14, h / 2 - 20, -1, false);
-                    } else {
-                        event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("des.superbwarfare.drone.range")
-                                        .append(Component.literal(new DecimalFormat("##.#").format(block_range) + "M")),
-                                w / 2 + 14, h / 2 - 20, -1, false);
-                    }
-                }
-                preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j);
-                preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/indicator.png"), k + (float) Math.tan(Mth.clamp(Mth.DEG_TO_RAD * diffY, -1.5, 1.5)) * 5 * i / 1.4f * (90 - Math.abs(player.getXRot())) / 90, l + (float) Math.tan(Mth.clamp(Mth.DEG_TO_RAD * diffX, -1.5, 1.5)) * 5 * j / 1.4f, 0, 0.0F, i, j, i, j);
-            } else {
-                preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j);
-            }
-
-            if (cannon instanceof Mk42Entity) {
-                health = cannon.getEntityData().get(net.mcreator.superbwarfare.entity.Mk42Entity.HEALTH);
-                maxHealth = 500;
-            }
-
-            if (cannon instanceof Mle1934Entity) {
-                health = cannon.getEntityData().get(net.mcreator.superbwarfare.entity.Mle1934Entity.HEALTH);
-                maxHealth = 600;
-            }
-
-            GuiGraphics guiGraphics = event.getGuiGraphics();
-            guiGraphics.pose().pushPose();
-            guiGraphics.blit(ARMOR, w - 96, h - 14, 0, 0, 12, 12, 12, 12);
-            guiGraphics.blit(HEALTH_FRAME, w - 83, h - 12, 0, 0, 80, 8, 80, 8);
-            guiGraphics.blit(HEALTH, w - 83, h - 12, 0, 0, (int)(80 * health / maxHealth), 8, 80, 8);
-            guiGraphics.pose().popPose();
+        float yRotOffset = Mth.lerp(event.getPartialTick(), player.yRotO, player.getYRot());
+        float xRotOffset = Mth.lerp(event.getPartialTick(), player.xRotO, player.getXRot());
+        float diffY = cannon.getViewYRot(event.getPartialTick()) - yRotOffset;
+        float diffX = cannon.getViewXRot(event.getPartialTick()) - xRotOffset + 1.3f;
+        float fovAdjust = (float) 70 / Minecraft.getInstance().options.fov().get();
+        if (diffY > 180.0f) {
+            diffY -= 360.0f;
+        } else if (diffY < -180.0f) {
+            diffY += 360.0f;
         }
+        float f = (float) Math.min(w, h);
+        float f1 = Math.min((float) w / f, (float) h / f) * fovAdjust;
+        int i = Mth.floor(f * f1);
+        int j = Mth.floor(f * f1);
+        int k = (w - i) / 2;
+        int l = (h - j) / 2;
+        if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) {
+            Entity lookingEntity = TraceTool.findLookingEntity(player, 512);
+            boolean lookAtEntity = false;
+            double block_range = player.position().distanceTo((Vec3.atLowerCornerOf(player.level().clip(
+                    new ClipContext(player.getEyePosition(), player.getEyePosition().add(player.getLookAngle().scale(512)),
+                            ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)).getBlockPos())));
+
+            double entity_range = 0;
+
+            if (lookingEntity instanceof LivingEntity living) {
+                lookAtEntity = true;
+                entity_range = player.distanceTo(living);
+            }
+            if (lookAtEntity) {
+                event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("des.superbwarfare.drone.range")
+                                .append(Component.literal(new DecimalFormat("##.#").format(entity_range) + "M " + lookingEntity.getDisplayName().getString())),
+                        w / 2 + 14, h / 2 - 20, -1, false);
+            } else {
+                if (block_range > 511) {
+                    event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("des.superbwarfare.drone.range")
+                            .append(Component.literal("---M")), w / 2 + 14, h / 2 - 20, -1, false);
+                } else {
+                    event.getGuiGraphics().drawString(Minecraft.getInstance().font, Component.translatable("des.superbwarfare.drone.range")
+                                    .append(Component.literal(new DecimalFormat("##.#").format(block_range) + "M")),
+                            w / 2 + 14, h / 2 - 20, -1, false);
+                }
+            }
+            preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j);
+            preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/indicator.png"), k + (float) Math.tan(Mth.clamp(Mth.DEG_TO_RAD * diffY, -1.5, 1.5)) * 5 * i / 1.4f * (90 - Math.abs(player.getXRot())) / 90, l + (float) Math.tan(Mth.clamp(Mth.DEG_TO_RAD * diffX, -1.5, 1.5)) * 5 * j / 1.4f, 0, 0.0F, i, j, i, j);
+        } else {
+            preciseBlit(event.getGuiGraphics(), ModUtils.loc("textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j);
+        }
+
+        if (cannon instanceof Mk42Entity) {
+            health = cannon.getEntityData().get(net.mcreator.superbwarfare.entity.Mk42Entity.HEALTH);
+            maxHealth = 500;
+        }
+
+        if (cannon instanceof Mle1934Entity) {
+            health = cannon.getEntityData().get(net.mcreator.superbwarfare.entity.Mle1934Entity.HEALTH);
+            maxHealth = 600;
+        }
+
+        GuiGraphics guiGraphics = event.getGuiGraphics();
+        guiGraphics.pose().pushPose();
+        guiGraphics.blit(ARMOR, w - 96, h - 14, 0, 0, 12, 12, 12, 12);
+        guiGraphics.blit(HEALTH_FRAME, w - 83, h - 12, 0, 0, 80, 8, 80, 8);
+        guiGraphics.blit(HEALTH, w - 83, h - 12, 0, 0, (int) (80 * health / maxHealth), 8, 80, 8);
+        guiGraphics.pose().popPose();
+
         RenderSystem.depthMask(true);
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();