diff --git a/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/Get-MonkeyAzDiagnosticSettingForResource.ps1 b/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/Get-MonkeyAzDiagnosticSettingForResource.ps1
index b6578ddc..3dc06b24 100644
--- a/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/Get-MonkeyAzDiagnosticSettingForResource.ps1
+++ b/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/Get-MonkeyAzDiagnosticSettingForResource.ps1
@@ -73,6 +73,10 @@ Function Get-MonkeyAzDiagnosticSettingForResource {
         }
         catch{
             Write-Verbose $_
+            #Do not drop the resource if the lookup fails
+            If($AddToObject.IsPresent){
+                return $InputObject
+            }
         }
     }
 }
diff --git a/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/New-MonkeyDiagnosticSettingObject.ps1 b/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/New-MonkeyAzDiagnosticObject.ps1
similarity index 96%
rename from src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/New-MonkeyDiagnosticSettingObject.ps1
rename to src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/New-MonkeyAzDiagnosticObject.ps1
index 52d7c746..80ccde51 100644
--- a/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/New-MonkeyDiagnosticSettingObject.ps1
+++ b/src/monkey365/core/api/azure/resourcemanagement/helpers/diagnosticSettings/New-MonkeyAzDiagnosticObject.ps1
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-Function New-MonkeyDiagnosticSettingObject {
+Function New-MonkeyAzDiagnosticObject {
 <#
         .SYNOPSIS
 		Create a new diagnostic setting object
@@ -29,7 +29,7 @@ Function New-MonkeyDiagnosticSettingObject {
         .NOTES
 	        Author		: Juan Garrido
             Twitter		: @tr1ana
-            File Name	: New-MonkeyDiagnosticSettingObject
+            File Name	: New-MonkeyAzDiagnosticObject
             Version     : 1.0
 
         .LINK
diff --git a/src/monkey365/core/api/azure/resourcemanagement/helpers/storageaccount/Get-MonkeyAzStorageAccountDiagnosticSetting.ps1 b/src/monkey365/core/api/azure/resourcemanagement/helpers/storageaccount/Get-MonkeyAzStorageAccountDiagnosticSetting.ps1
index fc3ae18b..0d221f9e 100644
--- a/src/monkey365/core/api/azure/resourcemanagement/helpers/storageaccount/Get-MonkeyAzStorageAccountDiagnosticSetting.ps1
+++ b/src/monkey365/core/api/azure/resourcemanagement/helpers/storageaccount/Get-MonkeyAzStorageAccountDiagnosticSetting.ps1
@@ -53,7 +53,7 @@ Function Get-MonkeyAzStorageAccountDiagnosticSetting {
                     'root'{
                         $diag = $objectId | Get-MonkeyAzDiagnosticSettingsById
                         If($null -ne $diag){
-                            $diag | New-MonkeyDiagnosticSettingObject
+                            $diag | New-MonkeyAzDiagnosticObject
                         }
                     }
                     'blob'{
@@ -61,7 +61,7 @@ Function Get-MonkeyAzStorageAccountDiagnosticSetting {
                         #Get diagnostic settings
                         $diag = $blobEndpoint | Get-MonkeyAzDiagnosticSettingsById
                         If($null -ne $diag){
-                            $diag | New-MonkeyDiagnosticSettingObject
+                            $diag | New-MonkeyAzDiagnosticObject
                         }
                     }
                     'queue'{
@@ -69,7 +69,7 @@ Function Get-MonkeyAzStorageAccountDiagnosticSetting {
                         #Get diagnostic settings
                         $diag = $queueEndpoint | Get-MonkeyAzDiagnosticSettingsById
                         If($null -ne $diag){
-                            $diag | New-MonkeyDiagnosticSettingObject
+                            $diag | New-MonkeyAzDiagnosticObject
                         }
                     }
                     'table'{
@@ -77,7 +77,7 @@ Function Get-MonkeyAzStorageAccountDiagnosticSetting {
                         #Get diagnostic settings
                         $diag = $tableEndpoint | Get-MonkeyAzDiagnosticSettingsById
                         If($null -ne $diag){
-                            $diag | New-MonkeyDiagnosticSettingObject
+                            $diag | New-MonkeyAzDiagnosticObject
                         }
                     }
                     'file'{
@@ -85,7 +85,7 @@ Function Get-MonkeyAzStorageAccountDiagnosticSetting {
                         #Get diagnostic settings
                         $diag = $fileEndpoint | Get-MonkeyAzDiagnosticSettingsById
                         If($null -ne $diag){
-                            $diag | New-MonkeyDiagnosticSettingObject
+                            $diag | New-MonkeyAzDiagnosticObject
                         }
                     }
                 }