diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
index 63db0adf7..29bbe2718 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
@@ -1,7 +1,9 @@
 using eShopOnContainers.Core.Models.Basket;
 using eShopOnContainers.Core.Models.Catalog;
 using eShopOnContainers.ViewModels.Base;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text.RegularExpressions;
 
 namespace eShopOnContainers.Core.Helpers
@@ -12,27 +14,35 @@ namespace eShopOnContainers.Core.Helpers
 
         public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems)
         {
-            if(catalogItems == null)
+            if (catalogItems == null)
             {
                 return;
             }
 
-            if (!ViewModelLocator.Instance.UseMockService 
-                && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
+            try
             {
-                foreach (var catalogItem in catalogItems)
+                if (!ViewModelLocator.Instance.UseMockService
+                    && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
                 {
-                    MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri);
-                    MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
-
-                    if (serverResult.Count != -1 && localResult.Count != -1)
+                    foreach (var catalogItem in catalogItems)
                     {
-                        var serviceIp = serverResult[0].Value;
-                        var localIp = localResult[0].Value;
-                        catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
+                        MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri);
+                        MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
+
+                        if (serverResult.Count != -1 && localResult.Count != -1)
+                        {
+                            var serviceIp = serverResult[0].Value;
+                            var localIp = localResult[0].Value;
+
+                            catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
+                        }
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex.Message);
+            }
         }
 
         public static void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems)
@@ -42,22 +52,29 @@ namespace eShopOnContainers.Core.Helpers
                 return;
             }
 
-            if (!ViewModelLocator.Instance.UseMockService
-                && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
+            try
             {
-                foreach (var basketItem in basketItems)
+                if (!ViewModelLocator.Instance.UseMockService
+                    && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
                 {
-                    MatchCollection serverResult = IpRegex.Matches(basketItem.PictureUrl);
-                    MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
-
-                    if (serverResult.Count != -1 && localResult.Count != -1)
+                    foreach (var basketItem in basketItems)
                     {
-                        var serviceIp = serverResult[0].Value;
-                        var localIp = localResult[0].Value;
-                        basketItem.PictureUrl = basketItem.PictureUrl.Replace(serviceIp, localIp);
+                        MatchCollection serverResult = IpRegex.Matches(basketItem.PictureUrl);
+                        MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
+
+                        if (serverResult.Count != -1 && localResult.Count != -1)
+                        {
+                            var serviceIp = serverResult[0].Value;
+                            var localIp = localResult[0].Value;
+                            basketItem.PictureUrl = basketItem.PictureUrl.Replace(serviceIp, localIp);
+                        }
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex.Message);
+            }
         }
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
index ce26b6d19..197306e3b 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
@@ -79,13 +79,13 @@ namespace eShopOnContainers.Core.ViewModels
 
                 OrderItems = orderItems;
 
-                var authToken = Settings.AuthAccessToken;
+                var authToken = Settings.AuthAccessToken;       
                 var userInfo = await _userService.GetUserInfoAsync(authToken);
 
                 // Create Shipping Address
                 ShippingAddress = new Address
                 {
-                    Id = new Guid(userInfo.UserId),
+                    Id = !string.IsNullOrEmpty(userInfo?.UserId) ? new Guid(userInfo.UserId) : Guid.NewGuid(),
                     Street = userInfo?.Street,
                     ZipCode = userInfo?.ZipCode,
                     State = userInfo?.State,
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 c9cb8a265..6da079c03 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>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
index ffa9c0b55..c9cb8a265 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak
@@ -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>