diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
index ffa9c0b55..c9cb8a265 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Startup.cs b/src/Services/Identity/eShopOnContainers.Identity/Startup.cs
index cf2fd9213..f132cd3c8 100644
--- a/src/Services/Identity/eShopOnContainers.Identity/Startup.cs
+++ b/src/Services/Identity/eShopOnContainers.Identity/Startup.cs
@@ -67,7 +67,7 @@ namespace eShopOnContainers.Identity
             clientUrls.Add("Spa", Configuration.GetValue<string>("SpaClient"));
 
             // Adds IdentityServer
-            services.AddIdentityServer()
+            services.AddIdentityServer(x => x.IssuerUri = "null")
                 .AddTemporarySigningCredential()
                 .AddInMemoryScopes(Config.GetScopes())
                 .AddInMemoryClients(Config.GetClients(clientUrls))
diff --git a/src/Web/WebMVC/Controllers/CartController.cs b/src/Web/WebMVC/Controllers/CartController.cs
index 99592b75a..2396631f0 100644
--- a/src/Web/WebMVC/Controllers/CartController.cs
+++ b/src/Web/WebMVC/Controllers/CartController.cs
@@ -52,17 +52,20 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 
         public async Task<IActionResult> AddToCart(CatalogItem productDetails)
         {
-            var user = _appUserParser.Parse(HttpContext.User);
-            var product = new BasketItem()
+            if (productDetails != null)
             {
-                Id = Guid.NewGuid().ToString(),
-                Quantity = 1,
-                ProductName = productDetails.Name,
-                PictureUrl = productDetails.PictureUri,
-                UnitPrice = productDetails.Price, 
-                ProductId = productDetails.Id
-            };
-            await _basketSvc.AddItemToBasket(user, product);
+                var user = _appUserParser.Parse(HttpContext.User);
+                var product = new BasketItem()
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    Quantity = 1,
+                    ProductName = productDetails.Name,
+                    PictureUrl = productDetails.PictureUri,
+                    UnitPrice = productDetails.Price,
+                    ProductId = productDetails.Id
+                };
+                await _basketSvc.AddItemToBasket(user, product);
+            }
             return RedirectToAction("Index", "Catalog");
         }
     }