diff --git a/fuzzing/fuzz-targets/fuzz_submodule.py b/fuzzing/fuzz-targets/fuzz_submodule.py
@@ -3,14 +3,23 @@
import os
import tempfile
from configparser import ParsingError
-from utils import is_expected_exception_message

-if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
    path_to_bundled_git_binary = os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
    os.environ["GIT_PYTHON_GIT_EXECUTABLE"] = path_to_bundled_git_binary

-with atheris.instrument_imports():
-    from git import Repo, GitCommandError, InvalidGitRepositoryError


def TestOneInput(data):
@@ -42,12 +51,12 @@ def TestOneInput(data):
                    writer.release()

                submodule.update(init=fdp.ConsumeBool(), dry_run=fdp.ConsumeBool(), force=fdp.ConsumeBool())
-
                submodule_repo = submodule.module()
-                new_file_path = os.path.join(
-                    submodule_repo.working_tree_dir,
-                    f"new_file_{fdp.ConsumeUnicodeNoSurrogates(fdp.ConsumeIntInRange(1, 512))}",
                )
                with open(new_file_path, "wb") as new_file:
                    new_file.write(fdp.ConsumeBytes(fdp.ConsumeIntInRange(1, 512)))
                submodule_repo.index.add([new_file_path])
@@ -67,16 +76,24 @@ def TestOneInput(data):
                )
                repo.index.commit(f"Removed submodule {submodule_name}")

-        except (ParsingError, GitCommandError, InvalidGitRepositoryError, FileNotFoundError, BrokenPipeError):
            return -1
-        except (ValueError, OSError) as e:
            expected_messages = [
                "SHA is empty",
                "Reference at",
                "embedded null byte",
                "This submodule instance does not exist anymore",
                "cmd stdin was empty",
-                "File name too long",
            ]
            if is_expected_exception_message(e, expected_messages):
                return -1
@@ -85,6 +102,7 @@ def TestOneInput(data):


def main():
    atheris.Setup(sys.argv, TestOneInput)
    atheris.Fuzz()