From 566d3029930f3f5b1050c47dd44d07635a1b2afd Mon Sep 17 00:00:00 2001
From: Luka Devic <43738975+LukaDevic@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:14:35 +0200
Subject: [PATCH] Update GetSingletonPage method and code clean up

---
 src/Geta.EPi.Extensions/SingletonPage/Extensions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Geta.EPi.Extensions/SingletonPage/Extensions.cs b/src/Geta.EPi.Extensions/SingletonPage/Extensions.cs
index a319323..639e88b 100644
--- a/src/Geta.EPi.Extensions/SingletonPage/Extensions.cs
+++ b/src/Geta.EPi.Extensions/SingletonPage/Extensions.cs
@@ -10,7 +10,7 @@ namespace Geta.EPi.Extensions.SingletonPage
     /// </summary>
     public static class Extensions
     {
-        private static readonly IContentReferenceCache DefaultContentReferenceCache 
+        private static readonly IContentReferenceCache DefaultContentReferenceCache
                                                             = new DefaultContentReferenceCache();
 
         /// <summary>
@@ -46,7 +46,7 @@ public static T GetSingletonPage<T>(this ContentReference rootPageLink)
             where T : PageData, new()
         {
             var singletonLink = Cache.GetOrAdd(new CacheKey(typeof(T), rootPageLink), rootPageLink.GetSingletonPageLink<T>);
-            return ContentLoader.Get<T>(singletonLink);
+            return singletonLink != ContentReference.EmptyReference ? ContentLoader.Get<T>(singletonLink) : null;
         }
 
         /// <summary>