diff --git a/NetFx/DecaTec.WebDav.NetFx/Properties/AssemblyInfo.cs b/NetFx/DecaTec.WebDav.NetFx/Properties/AssemblyInfo.cs
index 8e8995d..18383a2 100644
--- a/NetFx/DecaTec.WebDav.NetFx/Properties/AssemblyInfo.cs
+++ b/NetFx/DecaTec.WebDav.NetFx/Properties/AssemblyInfo.cs
@@ -26,5 +26,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("0.6.1.0")]
-[assembly: AssemblyFileVersion("0.6.1.0")]
+[assembly: AssemblyVersion("0.6.2.0")]
+[assembly: AssemblyFileVersion("0.6.2.0")]
diff --git a/NetFx/DecaTec.WebDav.NetFx/WebDavHelper.cs b/NetFx/DecaTec.WebDav.NetFx/WebDavHelper.cs
index e11c0a7..ea8115a 100644
--- a/NetFx/DecaTec.WebDav.NetFx/WebDavHelper.cs
+++ b/NetFx/DecaTec.WebDav.NetFx/WebDavHelper.cs
@@ -18,9 +18,11 @@ public static LockToken GetLockTokenFromWebDavResponseMessage(WebDavResponseMess
         {
             // Try to get lock token from response header.
             IEnumerable<string> lockTokenHeaderValues;
+
             if (responseMessage.Headers.TryGetValues(WebDavRequestHeader.LockTocken, out lockTokenHeaderValues))
             {
                 var lockTokenHeaderValue = lockTokenHeaderValues.FirstOrDefault();
+
                 if (lockTokenHeaderValue != null)
                     return new LockToken(lockTokenHeaderValue);
             }
diff --git a/Shared/DecaTec.WebDav.Shared/LockToken.cs b/Shared/DecaTec.WebDav.Shared/LockToken.cs
index caeba57..a58ec70 100644
--- a/Shared/DecaTec.WebDav.Shared/LockToken.cs
+++ b/Shared/DecaTec.WebDav.Shared/LockToken.cs
@@ -20,8 +20,7 @@ public LockToken(string lockToken)
         }
 
         /// <summary>
-        /// Gets the raw representation of the lock token for serialization purposes.
-        /// 
+        /// Gets the raw representation of the lock token for serialization purposes.        /// 
         /// Use <see cref="ToString"/> to get the formatted representation for use in headers.
         /// </summary>
         public string RawLockToken { get; }
diff --git a/Shared/DecaTec.WebDav.Shared/WebDavArtifacts/Prop.cs b/Shared/DecaTec.WebDav.Shared/WebDavArtifacts/Prop.cs
index 651f4fd..d742948 100644
--- a/Shared/DecaTec.WebDav.Shared/WebDavArtifacts/Prop.cs
+++ b/Shared/DecaTec.WebDav.Shared/WebDavArtifacts/Prop.cs
@@ -98,6 +98,9 @@ public static Prop CreatePropWithEmptyProperties(params string[] emptyPropertyNa
                     case PropNameConstants.ParentName:
                         prop.ParentName = string.Empty;
                         break;
+                    case PropNameConstants.SupportedLock:
+                        prop.SupportedLock = new SupportedLock();
+                        break;
                     case PropNameConstants.QuotaAvailableBytes:
                         prop.QuotaAvailableBytes = string.Empty;
                         break;
@@ -139,6 +142,7 @@ public static Prop CreatePropWithEmptyPropertiesAll()
             prop.LastAccessed = string.Empty;
             prop.Name = string.Empty;
             prop.ParentName = string.Empty;
+            prop.SupportedLock = new SupportedLock();
             prop.QuotaAvailableBytes = string.Empty;
             prop.QuotaUsedBytes = string.Empty;
             return prop;
diff --git a/Uwp/DecaTec.WebDav.Uwp/Properties/AssemblyInfo.cs b/Uwp/DecaTec.WebDav.Uwp/Properties/AssemblyInfo.cs
index 6ba1521..86ff2a2 100644
--- a/Uwp/DecaTec.WebDav.Uwp/Properties/AssemblyInfo.cs
+++ b/Uwp/DecaTec.WebDav.Uwp/Properties/AssemblyInfo.cs
@@ -26,5 +26,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("0.6.1.0")]
-[assembly: AssemblyFileVersion("0.6.1.0")]
+[assembly: AssemblyVersion("0.6.2.0")]
+[assembly: AssemblyFileVersion("0.6.2.0")]