diff --git a/src/Javinizer/Public/Get-DmmData.ps1 b/src/Javinizer/Public/Get-DmmData.ps1
index 65fb3c20..61c89f23 100644
--- a/src/Javinizer/Public/Get-DmmData.ps1
+++ b/src/Javinizer/Public/Get-DmmData.ps1
@@ -1,7 +1,7 @@
 function Get-DmmData {
     [CmdletBinding()]
     param (
-        [Parameter(Mandatory = $true, Position = 0, ValueFromPipeline = $true)]
+        [Parameter(Mandatory = $true, Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
         [string]$Url
     )
 
diff --git a/src/Javinizer/Public/Get-DmmUrl.ps1 b/src/Javinizer/Public/Get-DmmUrl.ps1
index 852a0625..9f535953 100644
--- a/src/Javinizer/Public/Get-DmmUrl.ps1
+++ b/src/Javinizer/Public/Get-DmmUrl.ps1
@@ -28,7 +28,7 @@ function Get-DmmUrl {
                 Write-JLog -Level Error -Message "Error [GET] on URL [$searchUrl]"
             }
 
-            $retryCount = 5
+            $retryCount = 3
             $searchResults = ($webrequest.links.href | Where-Object { $_ -like '*digital/videoa/*' })
             $numResults = $searchResults.count
 
@@ -64,11 +64,16 @@ function Get-DmmUrl {
             }
         }
 
-        $urlObject = [PSCustomObject]@{
-            Url      = $directUrl
-            Language = 'ja'
+        if ($null -eq $directUrl) {
+            Write-JLog -Level Warning -Message "Search [$Id] not matched on DMM"
+            return
+        } else {
+            $urlObject = [PSCustomObject]@{
+                Url      = $directUrl
+                Language = 'ja'
+            }
+    
+            Write-Output $urlObject
         }
-
-        Write-Output $urlObject
     }
 }
diff --git a/src/Javinizer/Public/Get-R18Url.ps1 b/src/Javinizer/Public/Get-R18Url.ps1
index a707600b..8c4e9347 100644
--- a/src/Javinizer/Public/Get-R18Url.ps1
+++ b/src/Javinizer/Public/Get-R18Url.ps1
@@ -39,7 +39,7 @@ function Get-R18Url {
             Write-JLog -Level Error -Message "Error [GET] on URL [$searchUrl]: $PSItem"
         }
 
-        $retryCount = 5
+        $retryCount = 3
         $searchResults = (($webRequest.Links | Where-Object { $_.href -like "*/videos/vod/*/detail/-/id=*" }).href)
         $numResults = $searchResults.count