diff --git a/GSCFieldApp/GSCFieldApp.csproj b/GSCFieldApp/GSCFieldApp.csproj
index 3aee7271..3d2c3e99 100644
--- a/GSCFieldApp/GSCFieldApp.csproj
+++ b/GSCFieldApp/GSCFieldApp.csproj
@@ -28,7 +28,7 @@
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-    <PackageCertificateThumbprint>1DA808AB7F24EA5D385C2463C710EEB77A852D73</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>14CF0ECF911C8A37CF0E2EF4F8E06F25425B80C1</PackageCertificateThumbprint>
     <AppxPackageDir>C:\work data\datacollections\PublishedVersions\</AppxPackageDir>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppInstallerUpdateFrequency>100</AppInstallerUpdateFrequency>
diff --git a/GSCFieldApp/Package.appxmanifest b/GSCFieldApp/Package.appxmanifest
index 213e497c..3e1d56cf 100644
--- a/GSCFieldApp/Package.appxmanifest
+++ b/GSCFieldApp/Package.appxmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"  xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10" IgnorableNamespaces="uap mp uap3 iot">
-  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.4.1.0" />
-  <mp:PhoneIdentity PhoneProductId="06e90cbe-1a34-4205-8fe6-3ce0ad4467db" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.4.4.0" />
+  <mp:PhoneIdentity PhoneProductId="3ace0625-7c8e-483c-8b82-fd0128bbb63a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Geological Survey Canada Field Application</DisplayName>
     <PublisherDisplayName>Natural Resources Canada</PublisherDisplayName>
diff --git a/GSCFieldApp/ViewModels/LocationViewModel.cs b/GSCFieldApp/ViewModels/LocationViewModel.cs
index 5b3222e3..db61080d 100644
--- a/GSCFieldApp/ViewModels/LocationViewModel.cs
+++ b/GSCFieldApp/ViewModels/LocationViewModel.cs
@@ -205,8 +205,12 @@ public void AutoFillDialog(FieldNotes incomingData)
             _locationEasting = existingDataDetailLocation.location.LocationEasting.ToString();
             _locationNorthing = existingDataDetailLocation.location.LocationNorthing.ToString();
             _locationNTS = existingDataDetailLocation.location.locationNTS;
-            _locationtimestamp = existingDataDetailLocation.location.LocationTimestamp.ToString();
 
+            if (existingDataDetailLocation.location.LocationTimestamp != null)
+            {
+                _locationtimestamp = existingDataDetailLocation.location.LocationTimestamp.ToString();
+            }
+            
             //Check for manual XY projections
             if (existingDataDetailLocation.location.LocationEPSGProj != null && existingDataDetailLocation.location.LocationEPSGProj != string.Empty)
             {
diff --git a/GSCFieldApp/ViewModels/SampleViewModel.cs b/GSCFieldApp/ViewModels/SampleViewModel.cs
index 151c06c3..eb50bff9 100644
--- a/GSCFieldApp/ViewModels/SampleViewModel.cs
+++ b/GSCFieldApp/ViewModels/SampleViewModel.cs
@@ -836,17 +836,25 @@ public string PipePurposes()
             return _samplePurposeConcat;
         }
 
+        /// <summary>
+        /// Will unpipe any incoming string and build the collection of values out of it
+        /// </summary>
+        /// <param name="inPurpose"></param>
         public void UnPipePurposes(string inPurpose)
         {
-            List<string> purposesUnpiped = inPurpose.Split(Dictionaries.DatabaseLiterals.KeywordConcatCharacter.Trim().ToCharArray()).ToList();
-
             //Clean values first
             _purposeValues.Clear();
 
-            foreach (string pu in purposesUnpiped)
+            if (inPurpose != null && inPurpose != string.Empty)
             {
-                AddAPurpose(pu.Trim());
+                List<string> purposesUnpiped = inPurpose.Split(Dictionaries.DatabaseLiterals.KeywordConcatCharacter.Trim().ToCharArray()).ToList();
+
+                foreach (string pu in purposesUnpiped)
+                {
+                    AddAPurpose(pu.Trim());
+                }
             }
+
         }
 
         /// <summary>