diff --git a/setup/tools/fileGen.class.php b/setup/tools/fileGen.class.php
index 03d87202..ed556e78 100644
--- a/setup/tools/fileGen.class.php
+++ b/setup/tools/fileGen.class.php
@@ -136,7 +136,7 @@ class FileGen
             $doScripts = array_unique($doScripts);
             return true;
         }
-        else if ($_ = CLISetup::getOpt('build'))
+        else if (is_array($_ = CLISetup::getOpt('build')))
         {
             $doScripts = $_;
             return true;
diff --git a/setup/tools/sqlGen.class.php b/setup/tools/sqlGen.class.php
index af775673..5b30685d 100644
--- a/setup/tools/sqlGen.class.php
+++ b/setup/tools/sqlGen.class.php
@@ -56,7 +56,7 @@ class SqlGen
 
                 if ($depsOK)
                 {
-                    if (isset(self::$tables[$ssRef->getName()]))
+                    if (isset(self::$tables[$ts->getName()]))
                     {
                         CLI::write('a SetupScript named '.CLI::bold($ts->getName()).' was already registered. Skipping...', CLI::LOG_WARN);
                         unset(self::$tmpStore[$idx]);