fix SetComposedLookByUrl with Uri.UnescapeDataString when string is null

pnp · Oct 21, 2021 · cf4a5c2 · cf4a5c2
1 parent 668a644
commit cf4a5c2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/lib/PnP.Framework/Extensions/BrandingExtensions.cs b/src/lib/PnP.Framework/Extensions/BrandingExtensions.cs
@@ -243,10 +243,10 @@ public static void SetComposedLookByUrl(this Web web, string lookName, string pa
             }
 
             //URL decode retrieved URL's
-            paletteUrl = Uri.UnescapeDataString(paletteUrl);
-            fontUrl = Uri.UnescapeDataString(fontUrl);
-            backgroundUrl = Uri.UnescapeDataString(backgroundUrl);
-            masterUrl = Uri.UnescapeDataString(masterUrl);
+            paletteUrl = !string.IsNullOrWhiteSpace(paletteUrl)?Uri.UnescapeDataString(paletteUrl):default(string);
+            fontUrl = !string.IsNullOrWhiteSpace(fontUrl)?Uri.UnescapeDataString(fontUrl):default(string);
+            backgroundUrl = !string.IsNullOrWhiteSpace(backgroundUrl)?Uri.UnescapeDataString(backgroundUrl):default(string);
+            masterUrl = !string.IsNullOrWhiteSpace(masterUrl)?Uri.UnescapeDataString(masterUrl):default(string);
 
             if (!string.IsNullOrEmpty(masterUrl))
             {