diff --git a/resources/classes/switch_settings.php b/resources/classes/switch_settings.php
index 83f4d3212e..cf82a483cc 100644
--- a/resources/classes/switch_settings.php
+++ b/resources/classes/switch_settings.php
@@ -239,7 +239,8 @@ if (!class_exists('switch_settings')) {
 							$array['default_settings'][$i]['default_setting_value'] = $row['default_setting_value'];
 							$array['default_settings'][$i]['default_setting_enabled'] = $row['default_setting_enabled'];
 							$array['default_settings'][$i]['default_setting_description'] = $row['default_setting_description'];
-						$i++;
+						//increment the row id
+							$i++;
 					}
 					if (is_array($array) && @sizeof($array) != 0) {
 						//grant temporary permissions
@@ -250,7 +251,6 @@ if (!class_exists('switch_settings')) {
 							$database->app_name = 'switch_settings';
 							$database->app_uuid = '84e91084-a227-43cd-ae99-a0f8ed61eb8b';
 							$database->save($array);
-							unset($array);
 						//revoke temporary permissions
 							$p->delete('default_setting_add', 'temp');
 					}
@@ -258,10 +258,12 @@ if (!class_exists('switch_settings')) {
 				}
 
 			//set the default settings
-				foreach ($array as $row) {
-					if (!isset($_SESSION['switch'][$row['default_setting_subcategory']])) {
-						if ($row['default_setting_enabled'] != "false") {
-							$_SESSION['switch'][$row['default_setting_subcategory']] = $row['default_setting_value'];
+				if (is_array($array) {
+					foreach ($array as $row) {
+						if (!isset($_SESSION['switch'][$row['default_setting_subcategory']])) {
+							if ($row['default_setting_enabled'] != "false") {
+								$_SESSION['switch'][$row['default_setting_subcategory']] = $row['default_setting_value'];
+							}
 						}
 					}
 				}