diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php
index d5084e20c6..f03aef1b29 100644
--- a/app/fax/fax_emails.php
+++ b/app/fax/fax_emails.php
@@ -40,7 +40,7 @@ $result = $database->select($sql, null, 'all');
 unset($sql);
 
 function arr_to_map(&$arr){
-	if(is_array($arr)){
+	if (!empty($arr)){
 		$map = Array();
 		foreach($arr as &$val){
 			$map[$val] = true;
@@ -50,7 +50,7 @@ function arr_to_map(&$arr){
 	return false;
 }
 
-if (is_array($result) && @sizeof($result) != 0) {
+if (!empty($result) && @sizeof($result) != 0) {
 
 	//load default settings
 	$default_settings = load_default_settings();
@@ -265,9 +265,11 @@ if (is_array($result) && @sizeof($result) != 0) {
 					print('***********************' . "\n");
 					print('fax message:' . "\n");
 					print(' - length: ' . strlen($fax_message) . "\n");
-					print('fax files [' . sizeof($emailed_files['name']) . ']:' . "\n");
-					for($i = 0; $i < sizeof($emailed_files['name']);++$i){
-						print(' - ' . $emailed_files['name'][$i] . ' - ' . $emailed_files['size'][$i] . "\n");
+					if (isset($emailed_files['name']) {
+						print('fax files [' . sizeof($emailed_files['name']) . ']:' . "\n");
+						for($i = 0; $i < sizeof($emailed_files['name']);++$i){
+							print(' - ' . $emailed_files['name'][$i] . ' - ' . $emailed_files['size'][$i] . "\n");
+						}
 					}
 					print('***********************' . "\n");
 
@@ -303,7 +305,7 @@ function load_default_settings() {
 	$database = new database;
 	$result = $database->select($sql, null, 'all');
 	//load the settings into an array
-	if (is_array($result) && @sizeof($result) != 0) {
+	if (!empty($result) && @sizeof($result) != 0) {
 		foreach ($result as $row) {
 			$name = $row['default_setting_name'];
 			$category = $row['default_setting_category'];
@@ -340,7 +342,7 @@ function load_domain_settings($domain_uuid) {
 		$parameters['domain_uuid'] = $domain_uuid;
 		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
-		if (is_array($result) && @sizeof($result) != 0) {
+		if (!empty($result) && @sizeof($result) != 0) {
 			//unset the arrays that domains are overriding
 				foreach ($result as $row) {
 					$name = $row['domain_setting_name'];