diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index c38448b452a..8076a990d26 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -63,11 +63,10 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
     		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
     		return -2;
     	}
-
-    	if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
-
+    	if (! preg_match('/^(price|sellist|date|varchar|double|text|html)/', $addfieldentry['type'])
+    		&& ! preg_match('/^(boolean|integer|real|timestamp)$/', $addfieldentry['type']))
     	{
-    		setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
+    		setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');
     		return -2;
     	}
     }
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a3e746bb3b8..b80977decd8 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -836,7 +836,10 @@ if ($dirins && $action == 'addproperty' && !empty($module) && ! empty($tabobj))
 	if (! $error)
 	{
 		$object=rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry);
-		if (is_numeric($result) && $result <= 0) $error++;
+		if (is_numeric($object) && $object <= 0)
+		{
+			$error++;
+		}
 	}
 
 	// Edit sql with new properties