diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index ae95c5c4b..0a465eb75 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -155,8 +155,8 @@ class installController extends install
 		// install by default XE UI
 		else
 		{
-			include $this->db_tmp_config_file;
-			include $this->etc_tmp_config_file;
+			if(FileHandler::exists($this->db_tmp_config_file))  include $this->db_tmp_config_file;
+			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index 0e48de4b7..8f3e71a63 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -264,7 +264,7 @@ class moduleController extends module
 
 			if($args->domain && !isSiteID($args->domain))
 			{
-				$args->domain = (substr_compare($domain, '/', -1) === 0) ? substr($domain, 0, -1) : $domain;
+				$args->domain = (strlen($args->domain) >= 1 && substr_compare($args->domain, '/', -1) === 0) ? substr($args->domain, 0, -1) : $args->domain;
 			}
 		}
 		$output = executeQuery('module.updateSite', $args);