diff --git a/src/Infrastructure/Services/WebFileSystem.cs b/src/Infrastructure/Services/WebFileSystem.cs
index d2f9ed5..d60a653 100644
--- a/src/Infrastructure/Services/WebFileSystem.cs
+++ b/src/Infrastructure/Services/WebFileSystem.cs
@@ -24,7 +24,7 @@ namespace Microsoft.eShopWeb.Infrastructure.Services
 
         public async Task<bool> SavePicture(string pictureName, string pictureBase64)
         {
-            if (!await UploadFile(pictureName, Convert.FromBase64String(pictureBase64)))
+            if (string.IsNullOrEmpty(pictureBase64) || !await UploadFile(pictureName, Convert.FromBase64String(pictureBase64)))
             {
                 return false;
             }