diff --git a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
index 31273268..dba163e8 100644
--- a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
@@ -188,6 +188,25 @@ public class RepositoriesClientTests
             }
         }
 
+
+        [IntegrationTest]
+        public async Task ThrowsInvalidGitIgnoreExceptionForInvalidTemplateNames()
+        {
+            var github = Helper.GetAuthenticatedClient();
+            var repoName = Helper.MakeNameWithTimestamp("repo-with-gitignore");
+
+            var newRepository = new NewRepository(repoName)
+            {
+                AutoInit = true,
+                GitignoreTemplate = "visualstudio"
+            };
+
+            var thrown = await Assert.ThrowsAsync<InvalidGitIgnoreTemplateException>(
+                    () => github.CreateRepositoryContext(newRepository));
+
+            Assert.NotNull(thrown);
+        }
+
         [IntegrationTest]
         public async Task ThrowsRepositoryExistsExceptionForExistingRepository()
         {
diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs
index b6bb1ccd..246876ad 100644
--- a/Octokit/Clients/RepositoriesClient.cs
+++ b/Octokit/Clients/RepositoriesClient.cs
@@ -117,10 +117,7 @@ namespace Octokit
                     throw new PrivateRepositoryQuotaExceededException(e);
                 }
                 
-                if (String.Equals(
-                    "gitignore_template is an unknown gitignore template.",
-                    errorMessage,
-                    StringComparison.OrdinalIgnoreCase))
+                if (errorMessage.EndsWith("is an unknown gitignore template.", StringComparison.OrdinalIgnoreCase))
                 {
                     throw new InvalidGitIgnoreTemplateException(e);
                 }