diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php
index 8c1bfdd7d..ff360b09d 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/AbstractBrick.php
@@ -687,6 +687,11 @@ abstract class AbstractBrick
 	 */
 	public static function LoadClassDefinitionFromPortalProperties($aPortalProperties)
 	{
+		// Check if they are any brick templates
+		if(!array_key_exists('bricks', $aPortalProperties['templates']) || !is_array($aPortalProperties['templates']['bricks'])) {
+			return;
+		}
+		
 		// Get the bricks templates
 		$aBricksTemplates = $aPortalProperties['templates']['bricks'];
 		$sClassFQCN = static::class;
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
index e430e62ae..c6c656d26 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
@@ -98,7 +98,7 @@ class ObjectController extends BrickController
 		protected ObjectFormHandlerHelper $oObjectFormHandlerHelper,
 		protected NavigationRuleHelper $oNavigationRuleHelper,
 		protected ContextManipulatorHelper $oContextManipulatorHelper,
-		protected  array $aCombodoPortalInstanceConf
+		protected  array $aCombodoPortalInstanceConf = []
 	)
 	{
 		ObjectBrick::InitializeSelf($this->aCombodoPortalInstanceConf);