diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java
index 99296bb2..5e1e81c1 100644
--- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java
@@ -283,22 +283,19 @@ public class CatalogManager {
             Emulator.getLogging().logSQLException(e);
         }
 
-        pages.forEachValue(new TObjectProcedure<CatalogPage>() {
-            @Override
-            public boolean execute(CatalogPage object) {
-                CatalogPage page = pages.get(object.parentId);
+        pages.forEachValue((object) -> {
+            CatalogPage page = pages.get(object.parentId);
 
-                if (page != null) {
-                    if (page.id != object.id) {
-                        page.addChildPage(object);
-                    }
-                } else {
-                    if (object.parentId != -2) {
-                        Emulator.getLogging().logStart("Parent Page not found for " + object.getPageName() + " (ID: " + object.id + ", parent_id: " + object.parentId + ")");
-                    }
+            if (page != null) {
+                if (page.id != object.id) {
+                    page.addChildPage(object);
+                }
+            } else {
+                if (object.parentId != -2) {
+                    Emulator.getLogging().logStart("Parent Page not found for " + object.getPageName() + " (ID: " + object.id + ", parent_id: " + object.parentId + ")");
                 }
-                return true;
             }
+            return true;
         });
 
         this.catalogPages.putAll(pages);
diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/CatalogRootLayout.java b/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/CatalogRootLayout.java
index d219baf4..d73e77a6 100644
--- a/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/CatalogRootLayout.java
+++ b/src/main/java/com/eu/habbo/habbohotel/catalog/layouts/CatalogRootLayout.java
@@ -9,6 +9,17 @@ import java.sql.SQLException;
 public class CatalogRootLayout extends CatalogPage {
     public CatalogRootLayout() {
         super();
+
+        this.id = -1;
+        this.parentId = -2;
+        this.rank = 0;
+        this.caption = "root";
+        this.pageName = "root";
+        this.iconColor = 0;
+        this.iconImage = 0;
+        this.orderNum = -10;
+        this.visible = true;
+        this.enabled = true;
     }
 
     public CatalogRootLayout(ResultSet set) throws SQLException {