diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 82abc3e2e0..ba6a567c36 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -296,7 +296,9 @@ if(!$install_step) { $install_step = 'select_language'; }
 			try {
 				require_once "resources/classes/global_settings.php";
 				$settings = new global_settings($detect_switch, $domain_name);
-
+				if($settings = null){
+					throw new Exception("Error global_settings came back with null");
+				}
 				require_once "resources/classes/install_fusionpbx.php";
 				$system = new install_fusionpbx($settings);
 				$system->admin_username = $admin_username;
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 17bfa24f0c..ab096ca715 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -46,7 +46,10 @@ include "root.php";
 		public $template_name = 'enhanced';
 
 	 	function __construct($global_settings) {
-			if(!is_a($global_settings, 'global_settings')){
+			if($global_settings == null){
+				require_once "resources/classes/global_settings.php";
+				$global_settings = new global_settings();
+			elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
 			$this->global_settings = $global_settings;
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 67b45e3bb1..f9fa1b9ec2 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -35,7 +35,10 @@ include "root.php";
 		public $debug = false;
 
 		function __construct($global_settings) {
-			if(!is_a($global_settings, 'global_settings')){
+			if($global_settings == null){
+				require_once "resources/classes/global_settings.php";
+				$global_settings = new global_settings();
+			elseif(!is_a($global_settings, 'global_settings')){
 				throw new Exception('The parameter $global_settings must be a global_settings object (or a subclass of)');
 			}
 			$this->global_settings = $global_settings;
diff --git a/core/install/upgrade_switch.php b/core/install/upgrade_switch.php
index dc579b4a86..fd34d3c806 100644
--- a/core/install/upgrade_switch.php
+++ b/core/install/upgrade_switch.php
@@ -53,7 +53,7 @@
 
 //run switch upgrade
 	require_once "resources/classes/install_switch.php";
-	$switch = new install_switch;
+	$switch = new install_switch();
 	$switch->upgrade();
 
 ?>
\ No newline at end of file