diff --git a/src/DemaConsulting.VersionMark/PathHelpers.cs b/src/DemaConsulting.VersionMark/PathHelpers.cs
index 0791cfc..cec6128 100644
--- a/src/DemaConsulting.VersionMark/PathHelpers.cs
+++ b/src/DemaConsulting.VersionMark/PathHelpers.cs
@@ -34,6 +34,10 @@ internal static class PathHelpers
     /// <exception cref="ArgumentException">Thrown when relativePath contains invalid characters or path traversal sequences.</exception>
     internal static string SafePathCombine(string basePath, string relativePath)
     {
+        // Validate inputs
+        ArgumentNullException.ThrowIfNull(basePath);
+        ArgumentNullException.ThrowIfNull(relativePath);
+
         // Ensure the relative path doesn't contain path traversal sequences
         if (relativePath.Contains("..") || Path.IsPathRooted(relativePath))
         {
diff --git a/test/DemaConsulting.VersionMark.Tests/PathHelpersTests.cs b/test/DemaConsulting.VersionMark.Tests/PathHelpersTests.cs
index 9c882b0..f3ab7d0 100644
--- a/test/DemaConsulting.VersionMark.Tests/PathHelpersTests.cs
+++ b/test/DemaConsulting.VersionMark.Tests/PathHelpersTests.cs
@@ -26,6 +26,36 @@ namespace DemaConsulting.VersionMark.Tests;
 [TestClass]
 public class PathHelpersTests
 {
+    /// <summary>
+    ///     Test that SafePathCombine throws ArgumentNullException when basePath is null.
+    /// </summary>
+    [TestMethod]
+    public void PathHelpers_SafePathCombine_NullBasePath_ThrowsArgumentNullException()
+    {
+        // Arrange
+        string? basePath = null;
+        var relativePath = "subfolder/file.txt";
+
+        // Act & Assert
+        Assert.Throws<ArgumentNullException>(() =>
+            PathHelpers.SafePathCombine(basePath!, relativePath));
+    }
+
+    /// <summary>
+    ///     Test that SafePathCombine throws ArgumentNullException when relativePath is null.
+    /// </summary>
+    [TestMethod]
+    public void PathHelpers_SafePathCombine_NullRelativePath_ThrowsArgumentNullException()
+    {
+        // Arrange
+        var basePath = "/home/user/project";
+        string? relativePath = null;
+
+        // Act & Assert
+        Assert.Throws<ArgumentNullException>(() =>
+            PathHelpers.SafePathCombine(basePath, relativePath!));
+    }
+
     /// <summary>
     ///     Test that SafePathCombine correctly combines valid paths.
     /// </summary>