diff --git a/CopyToSQLite/Properties/AssemblyInfo.cs b/CopyToSQLite/Properties/AssemblyInfo.cs
index 6cf8a2db..a3d865e0 100644
--- a/CopyToSQLite/Properties/AssemblyInfo.cs
+++ b/CopyToSQLite/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.9.0")]
-[assembly: AssemblyFileVersion("2.7.9.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.7.10.0")]
+[assembly: AssemblyFileVersion("2.7.10.0")]
\ No newline at end of file
diff --git a/DatabaseSchemaReader/DatabaseSchemaReader.csproj b/DatabaseSchemaReader/DatabaseSchemaReader.csproj
index bfca6a9f..e1caaaa1 100644
--- a/DatabaseSchemaReader/DatabaseSchemaReader.csproj
+++ b/DatabaseSchemaReader/DatabaseSchemaReader.csproj
@@ -32,7 +32,7 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <Version>2.7.9</Version>
+    <Version>2.7.10</Version>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
diff --git a/DatabaseSchemaReader/Properties/AssemblyInfo.cs b/DatabaseSchemaReader/Properties/AssemblyInfo.cs
index 3324986d..7ef58cb1 100644
--- a/DatabaseSchemaReader/Properties/AssemblyInfo.cs
+++ b/DatabaseSchemaReader/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.9.0")]
-[assembly: AssemblyFileVersion("2.7.9.0")]
+[assembly: AssemblyVersion("2.7.10.0")]
+[assembly: AssemblyFileVersion("2.7.10.0")]
 [assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("DatabaseSchemaReaderTest")]
\ No newline at end of file
diff --git a/DatabaseSchemaReader/SqlGen/SqlServer/ConstraintWriter.cs b/DatabaseSchemaReader/SqlGen/SqlServer/ConstraintWriter.cs
index f2223534..d5f9f3e2 100644
--- a/DatabaseSchemaReader/SqlGen/SqlServer/ConstraintWriter.cs
+++ b/DatabaseSchemaReader/SqlGen/SqlServer/ConstraintWriter.cs
@@ -33,7 +33,7 @@ public override string WritePrimaryKey(DatabaseConstraint constraint)
             {
                 //UNIQUEIDENTIFIERs may have NON CLUSTERED indexes
                 //the pk index will have IndexType of PRIMARY NONCLUSTERED
-                var pkIndex = Table.Indexes.Find(x => x.IndexType.IndexOf("PRIMARY", StringComparison.OrdinalIgnoreCase) != -1);
+                var pkIndex = Table.Indexes.Find(x => x.IndexType?.IndexOf("PRIMARY", StringComparison.OrdinalIgnoreCase) != -1);
                 if (pkIndex != null &&
                     pkIndex.IndexType.IndexOf("NONCLUSTERED", StringComparison.OrdinalIgnoreCase) != -1)
                 {
diff --git a/DatabaseSchemaViewer/Properties/AssemblyInfo.cs b/DatabaseSchemaViewer/Properties/AssemblyInfo.cs
index 9973e072..53ec1c5e 100644
--- a/DatabaseSchemaViewer/Properties/AssemblyInfo.cs
+++ b/DatabaseSchemaViewer/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.9.0")]
-[assembly: AssemblyFileVersion("2.7.9.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.7.10.0")]
+[assembly: AssemblyFileVersion("2.7.10.0")]
\ No newline at end of file