diff --git a/src/Moryx.Resources.Management/Facades/ResourceManagementFacade.cs b/src/Moryx.Resources.Management/Facades/ResourceManagementFacade.cs
index c3db7f894..df33ecb58 100644
--- a/src/Moryx.Resources.Management/Facades/ResourceManagementFacade.cs
+++ b/src/Moryx.Resources.Management/Facades/ResourceManagementFacade.cs
@@ -59,35 +59,35 @@ private void OnResourceRemoved(object sender, IPublicResource publicResource)
         public TResource GetResource<TResource>() where TResource : class, IPublicResource
         {
             ValidateHealthState();
-            return ResourceGraph.GetResource<TResource>().Proxify(TypeController);
+            return ResourceGraph.GetResource<TResource>()?.Proxify(TypeController);
         }
 
         public TResource GetResource<TResource>(long id)
             where TResource : class, IPublicResource
         {
             ValidateHealthState();
-            return ResourceGraph.GetResource<TResource>(id).Proxify(TypeController);
+            return ResourceGraph.GetResource<TResource>(id)?.Proxify(TypeController);
         }
 
         public TResource GetResource<TResource>(string name)
             where TResource : class, IPublicResource
         {
             ValidateHealthState();
-            return ResourceGraph.GetResource<TResource>(name).Proxify(TypeController);
+            return ResourceGraph.GetResource<TResource>(name)?.Proxify(TypeController);
         }
 
         public TResource GetResource<TResource>(ICapabilities requiredCapabilities)
             where TResource : class, IPublicResource
         {
             ValidateHealthState();
-            return ResourceGraph.GetResource<TResource>(r => requiredCapabilities.ProvidedBy(r.Capabilities)).Proxify(TypeController);
+            return ResourceGraph.GetResource<TResource>(r => requiredCapabilities.ProvidedBy(r.Capabilities))?.Proxify(TypeController);
         }
 
         public TResource GetResource<TResource>(Func<TResource, bool> predicate)
             where TResource : class, IPublicResource
         {
             ValidateHealthState();
-            return ResourceGraph.GetResource(predicate).Proxify(TypeController);
+            return ResourceGraph.GetResource(predicate)?.Proxify(TypeController);
         }
 
         public IEnumerable<TResource> GetResources<TResource>() where TResource : class, IPublicResource