diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index 40f70650..f4446160 100644
--- a/Marechai/Marechai.csproj
+++ b/Marechai/Marechai.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>4.0.0.1557</Version>
+    <Version>4.0.0.1569</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>
diff --git a/Marechai/Pages/Companies/View.razor b/Marechai/Pages/Companies/View.razor
index f89470a5..d0ed2363 100644
--- a/Marechai/Pages/Companies/View.razor
+++ b/Marechai/Pages/Companies/View.razor
@@ -122,21 +122,28 @@
         <tr>
             <th>@L["Country"]</th>
             <td>
-                <a href="/companies/country/@_company.CountryId">
-                    @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", _company.CountryId + ".svg")))
-                    {
-                        <picture>
-                            <source type="image/svg+xml" srcset="/assets/flags/countries/@(_company.CountryId).svg">
-                            <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@(_company.CountryId).webp,
+                @if (_company.Country != null)
+                {
+                    <a href="/companies/country/@_company.CountryId">
+                        @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", _company.CountryId + ".svg")))
+                        {
+                            <picture>
+                                <source type="image/svg+xml" srcset="/assets/flags/countries/@(_company.CountryId).svg">
+                                <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@(_company.CountryId).webp,
         /assets/flags/countries/webp/1x/@(_company.CountryId).webp 2x,
         /assets/flags/countries/webp/1x/@(_company.CountryId).webp 3x">
-                            <img srcset="/assets/flags/countries/png/1x/@(_company.CountryId).png,
+                                <img srcset="/assets/flags/countries/png/1x/@(_company.CountryId).png,
                                  /assets/flags/countries/png/1x/@(_company.CountryId).png 2x,
                                  /assets/flags/countries/png/1x/@(_company.CountryId).webp 3x" src="/assets/flags/countries/png/1x@(_company.CountryId).png" alt="" height="32" />
-                        </picture>
-                    }
-                    @L[_company.Country]
-                </a>
+                            </picture>
+                        }
+                        @L[_company.Country]
+                    </a>
+                }
+                else
+                {
+                    @L["Unknown (country)"]
+                }
             </td>
         </tr>
         <tr>
diff --git a/codealike.json b/codealike.json
index ea20eadf..4cd89ae1 100644
--- a/codealike.json
+++ b/codealike.json
@@ -1 +1 @@
-{"projectId":"db06ff35-f00a-4492-a887-0e2c62d6c2ba","projectName":"Marechai"}
\ No newline at end of file
+{"projectId":"db06ff35-f00a-4492-a887-0e2c62d6c2ba","projectName":"Marechai","neverTrack":false}
\ No newline at end of file