diff --git a/core/simplegraph.class.inc.php b/core/simplegraph.class.inc.php
index 564ebfeec..157e9eae1 100644
--- a/core/simplegraph.class.inc.php
+++ b/core/simplegraph.class.inc.php
@@ -537,7 +537,7 @@ EOF
 		}
 		else
 		{
-			throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')');
+            throw new Exception('graphviz not found');
 		}
 		return $sHtml;
 	}
@@ -592,7 +592,7 @@ EOF
 		}
 		else
 		{
-			throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')');
+            throw new Exception('graphviz not found');
 		}
 		return $sHtml;
 	}
diff --git a/setup/unattended-install/unattended-install.php b/setup/unattended-install/unattended-install.php
index fdf1ca5e0..2ac9eafb7 100644
--- a/setup/unattended-install/unattended-install.php
+++ b/setup/unattended-install/unattended-install.php
@@ -25,7 +25,9 @@ EOF;
     exit(-1);
 }
 /////////////////////////////////////////////////
-if (! utils::IsModeCLI())
+
+$sCleanName = strtolower(trim(PHP_SAPI));
+if ($sCleanName !== 'cli')
 {
 	echo "Mode CLI only";
 	exit(-1);