diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46468e5..96eb0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is mainly based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.6.2 - 2019-09-05
+
+* Fixed: Prevent empty SAN entries in New-DomainSignedCertificate
+
 ## 2.6.1 - 2019-09-05
 
 * Fixed: Use Base64 only optionally in New-DomainSignedCertificate
diff --git a/Modules/SecurityFever/Functions/Certificate/New-DomainSignedCertificate.ps1 b/Modules/SecurityFever/Functions/Certificate/New-DomainSignedCertificate.ps1
index 28e4f6a..59ab348 100644
--- a/Modules/SecurityFever/Functions/Certificate/New-DomainSignedCertificate.ps1
+++ b/Modules/SecurityFever/Functions/Certificate/New-DomainSignedCertificate.ps1
@@ -46,13 +46,13 @@ function New-DomainSignedCertificate
         $Subject,
 
         # Add dns names to the subject alternative name.
-        [Parameter(Mandatory = $true, Position = 1)]
+        [Parameter(Mandatory = $false)]
         [AllowEmptyCollection()]
         [System.String[]]
         $DnsName,
 
         # Add IP addresses to the subject alternative name.
-        [Parameter(Mandatory = $false, Position = 2)]
+        [Parameter(Mandatory = $false)]
         [AllowEmptyCollection()]
         [System.String[]]
         $IPAddress,
@@ -160,11 +160,17 @@ function New-DomainSignedCertificate
         $policy += '2.5.29.17 = "{text}"'
         foreach ($currentDnsName in $DnsName)
         {
-            $policy += '_continue_ = "DNS={0}&"' -f $currentDnsName
+            if (-not [System.String]::IsNullOrEmpty($currentDnsName))
+            {
+                $policy += '_continue_ = "DNS={0}&"' -f $currentDnsName
+            }
         }
         foreach ($currentIPAddress in $IPAddress)
         {
-            $policy += '_continue_ = "IPAddress={0}&"' -f $currentIPAddress
+            if (-not [System.String]::IsNullOrEmpty($currentIPAddress))
+            {
+                $policy += '_continue_ = "IPAddress={0}&"' -f $currentIPAddress
+            }
         }
         $policy += ''
         $policy += '[RequestAttributes]'
@@ -228,11 +234,11 @@ function New-DomainSignedCertificate
             # Submit the certificate request to the CA
 
             Write-Verbose "Sign request and export to $Subject.cer"
-            Write-Verbose "> certreq.exe -submit -q -f `"$Path\$Subject.req`" `"$Path\$Subject.cer`""
+            Write-Verbose "> certreq.exe -submit -f `"$Path\$Subject.req`" `"$Path\$Subject.cer`""
 
             Write-Progress -Activity $activity -Status "Sign request and export to $Subject.cer" -PercentComplete 28
 
-            $result = (& $certReqCmd -submit -q -f "`"$Path\$Subject.req`"" "`"$Path\$Subject.cer`"")
+            $result = (& $certReqCmd -submit -f "`"$Path\$Subject.req`"" "`"$Path\$Subject.cer`"")
 
             if ($Global:LASTEXITCODE -ne 0)
             {
diff --git a/Modules/SecurityFever/SecurityFever.psd1 b/Modules/SecurityFever/SecurityFever.psd1
index 3054828..5ffa8b7 100644
--- a/Modules/SecurityFever/SecurityFever.psd1
+++ b/Modules/SecurityFever/SecurityFever.psd1
@@ -3,7 +3,7 @@
     RootModule = 'SecurityFever.psm1'
 
     # Version number of this module.
-    ModuleVersion = '2.6.1'
+    ModuleVersion = '2.6.2'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()