diff --git a/Public/Domain/func_Get-OPDomain.ps1 b/Public/Domain/func_Get-OPDomain.ps1
index 08bb44e..7fc58ed 100644
--- a/Public/Domain/func_Get-OPDomain.ps1
+++ b/Public/Domain/func_Get-OPDomain.ps1
@@ -76,6 +76,10 @@ function Get-OPDomain {
                     DNSSec          = $domains[$i].is_dnssec_enabled
                     Sectigo         = $domains[$i].is_sectigo_dns_enabled
                     NameserverGroup = $domains[$i].ns_group
+                    OwnerHandle     = $domains[$i].owner_handle
+                    AdminHandle     = $domains[$i].admin_handle
+                    TechHandle      = $domains[$i].tech_handle
+
                 }
             }
             $return_object += $domain_object
diff --git a/Public/SSL/func_Get-OPSSLOrders.ps1 b/Public/SSL/func_Get-OPSSLOrders.ps1
index f2095a4..ebfb6b8 100644
--- a/Public/SSL/func_Get-OPSSLOrders.ps1
+++ b/Public/SSL/func_Get-OPSSLOrders.ps1
@@ -38,7 +38,7 @@ function Get-OPSSLOrders {
                 Product          = $order.product_name
                 Hostname         = $order.common_name
                 Status           = ($statusMap | Select-Object $($order.status)).$($order.status)
-                ExpirationDate   = [datetime]$order.expiration_date
+                ExpirationDate   = if ($null -ne $order.expiration_date) { [datetime]$order.expiration_date } else { $null }
                 Period           = $order.period
                 AutoRenew        = if ($order.autorenew -eq "on") { $true } else { $false }
                 ValidationMethod = $order.validation_method