From 42511eb7463d76e423146ac4f3178070bfa4eb6c Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@gmail.com>
Date: Wed, 1 Jul 2026 07:27:48 +0100
Subject: [PATCH] fix: Avoid NPE when page not found - EXO-88179 Prior to this
 change, when a page is deleted, an NPE is thrown rather than returning null
 as Page Key. This change avoids the NPe and let the Parmission ACL return
 false when the Page Key is returned as null.

---
 .../plugin/attachment/LayoutBackgroundAttachmentPlugin.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout-service/src/main/java/io/meeds/layout/plugin/attachment/LayoutBackgroundAttachmentPlugin.java b/layout-service/src/main/java/io/meeds/layout/plugin/attachment/LayoutBackgroundAttachmentPlugin.java
index cd23ac5d0..8df1cb348 100644
--- a/layout-service/src/main/java/io/meeds/layout/plugin/attachment/LayoutBackgroundAttachmentPlugin.java
+++ b/layout-service/src/main/java/io/meeds/layout/plugin/attachment/LayoutBackgroundAttachmentPlugin.java
@@ -120,7 +120,7 @@ private PageKey getPageKey(String entityId) {
       return null;
     } else {
       Page page = layoutService.getPage(pageId);
-      return page.getPageKey();
+      return page == null ? null : page.getPageKey();
     }
   }