diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 18e0fa495be..2e6f9e93733 100755
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -88,14 +88,14 @@ $workflow=array(
 		)
 );
 
-if (! empty($conf->modules_parts['workflow'])) $workflow = array_merge($workflow, $conf->modules_parts['workflow']);
+if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) $workflow = array_merge($workflow, $conf->modules_parts['workflow']);
 
 foreach($workflow as $child => $parents)
 {
 	if ($conf->$child->enabled)
 	{
 		$langs->Load($child.'@'.$child);
-		
+
 		foreach($parents as $parent => $actions)
 		{
 			if ($conf->$parent->enabled)