diff --git a/src/Core.UnitTests/LanguageTests.cs b/src/Core.UnitTests/LanguageTests.cs
index 81d7bcbfd..49b841bce 100644
--- a/src/Core.UnitTests/LanguageTests.cs
+++ b/src/Core.UnitTests/LanguageTests.cs
@@ -36,7 +36,6 @@ public void Language_Ctor_ArgChecks()
             var fileSuffix = "suffix";
             var repoInfos = repoInfo;
             var serverLanguage = new SonarQubeLanguage("serverKey", "serverName");
-            RepoInfo defaultRepo = default;
 
             // Act + Assert
             // Nulls
@@ -49,14 +48,11 @@ public void Language_Ctor_ArgChecks()
             act = () => new Language(name, key, null, repoInfos, settingsFileName: fileSuffix);
             act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("serverLanguage");
 
-            act = () => new Language(name, key, serverLanguage, defaultRepo, settingsFileName: fileSuffix);
-            act.Should().ThrowExactly<ArgumentException>().WithMessage("repoInfo");
+            act = () => new Language(name, key, serverLanguage, null, settingsFileName: fileSuffix);
+            act.Should().ThrowExactly<ArgumentNullException>().And.ParamName.Should().Be("repoInfo");
 
             act = () => new Language(name, key, serverLanguage, repoInfos, securityRepoInfo: null, settingsFileName: fileSuffix);
-            act.Should().NotThrow<ArgumentException>();
-
-            act = () => new Language(name, key, serverLanguage, repoInfos, defaultRepo, settingsFileName: fileSuffix);
-            act.Should().ThrowExactly<ArgumentException>().WithMessage("securityRepoInfo");
+            act.Should().NotThrow<ArgumentNullException>();
         }
 
         [TestMethod]
diff --git a/src/Core/Language.cs b/src/Core/Language.cs
index fc6173b9a..d0171911e 100644
--- a/src/Core/Language.cs
+++ b/src/Core/Language.cs
@@ -107,9 +107,9 @@ public sealed class Language : IEquatable<Language>
         public RepoInfo RepoInfo { get; }
 
         /// <summary>
-        /// The repository info for the security rules (i.e. hotspots) for this language
+        /// Nullable, the repository info for the security rules (i.e. hotspots) for this language
         /// </summary>
-        public RepoInfo? SecurityRepoInfo { get; }
+        public RepoInfo SecurityRepoInfo { get; }
 
         /// <summary>
         /// Returns whether or not this language is a supported project language.
@@ -142,7 +142,7 @@ public Language(
             string name,
             SonarQubeLanguage serverLanguage,
             RepoInfo repoInfo,
-            RepoInfo? securityRepoInfo = null,
+            RepoInfo securityRepoInfo = null,
             string settingsFileName = null)
         {
             if (string.IsNullOrWhiteSpace(id))
@@ -159,8 +159,8 @@ public Language(
             Name = name;
             SettingsFileNameAndExtension = settingsFileName;
             ServerLanguage = serverLanguage ?? throw new ArgumentNullException(nameof(serverLanguage));
-            RepoInfo = repoInfo == default ? throw new ArgumentException(nameof(repoInfo)) : repoInfo;
-            SecurityRepoInfo = securityRepoInfo != null && securityRepoInfo.Value == default ? throw new ArgumentException(nameof(securityRepoInfo)) : securityRepoInfo;
+            RepoInfo = repoInfo ?? throw new ArgumentNullException(nameof(repoInfo));
+            SecurityRepoInfo = securityRepoInfo;
         }
 
         #region IEquatable<Language> and Equals