2 files changed, 6 insertions, 1 deletions

diff --git a/src/burn/engine/section.cpp b/src/burn/engine/section.cpp
index 989bfb17..fd3ce92c 100644
--- a/src/burn/engine/section.cpp
+++ b/src/burn/engine/section.cpp
@@ -369,7 +369,7 @@ HRESULT VerifySectionMatchesMemoryPEHeader(
     if (sizeof(BURN_SECTION_HEADER) > pSectionHeader->SizeOfRawData)
     {
         hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
-        ExitOnRootFailure(hr, "Failed to read section info, data to short: %u", pSectionHeader->SizeOfRawData);
+        ExitOnRootFailure(hr, "Failed to read section info, data too short: %u", pSectionHeader->SizeOfRawData);
     }
 
     // Get Burn section info.
diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 46ab2bd1..4fafc0a0 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -506,6 +506,11 @@ namespace WixToolset.Firewall
     {
         public static string ToCamelCase(this string str)
         {
+            if (String.IsNullOrEmpty(str))
+            {
+                return str;
+            }
+
             var camelCase = str[0].ToString().ToLowerInvariant() + str.Substring(1);
 
             return camelCase;