diff --git a/Modules.Logging/LogConfig.vb b/Modules.Logging/LogConfig.vb
index b9219126..5b4e7e5c 100644
--- a/Modules.Logging/LogConfig.vb
+++ b/Modules.Logging/LogConfig.vb
@@ -219,8 +219,14 @@ Public Class LogConfig
             logFileSuffix = $"-{Suffix}"
         End If
 
+        Dim oProductName As String = "Main"
+
+        If ProductName IsNot Nothing Then
+            oProductName = ProductName
+        End If
+
         ' Create config object and initalize it
-        config = GetConfig(ProductName, logFileSuffix)
+        config = GetConfig(oProductName, logFileSuffix)
 
         ' Save config
         LogFactory = New LogFactory With {