diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 384fd608597..1205cd8606f 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -51,7 +51,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 	}
 
 	// Check parameters
-	if (count($addfieldentry) > 0)
+	if (is_array($addfieldentry) && count($addfieldentry) > 0)
 	{
 		if (empty($addfieldentry['name']))
 		{