diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 608ceaccf0..563922d73a 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -778,18 +778,22 @@
 		$template_dir = $device->get_template_dir();
 		echo "	<select id='device_template' name='device_template' class='formfld'>\n";
 		echo "		<option value=''></option>\n";
-		if (is_dir($template_dir) && is_array($device_vendors)) {
-			foreach($device_vendors as $row) {
+		if (is_dir($template_dir) && @is_array($device_vendors)) {
+			foreach ($device_vendors as $row) {
 				echo "		<optgroup label='".escape($row["name"])."'>\n";
-				$templates = scandir($template_dir.'/'.$row["name"]);
-				foreach($templates as $dir) {
-					if ($file != "." && $dir != ".." && $dir[0] != '.') {
-						if (is_dir($template_dir . '/' . $row["name"] .'/'. $dir)) {
-							if ($device_template == $row["name"]."/".$dir) {
-								echo "			<option value='".escape($row["name"])."/".escape($dir)."' selected='selected'>".escape($row["name"])."/".escape($dir)."</option>\n";
-							}
-							else {
-								echo "			<option value='".escape($row["name"])."/".escape($dir)."'>".$row["name"]."/".escape($dir)."</option>\n";
+				if (file_exists($template_dir.'/'.$row["name"])) {
+					$templates = scandir($template_dir.'/'.$row["name"]);
+					if (is_array($templates) && @sizeof($templates) != 0) {
+						foreach ($templates as $dir) {
+							if ($file != "." && $dir != ".." && $dir[0] != '.') {
+								if (is_dir($template_dir . '/' . $row["name"] .'/'. $dir)) {
+									if ($device_template == $row["name"]."/".$dir) {
+										echo "			<option value='".escape($row["name"])."/".escape($dir)."' selected='selected'>".escape($row["name"])."/".escape($dir)."</option>\n";
+									}
+									else {
+										echo "			<option value='".escape($row["name"])."/".escape($dir)."'>".$row["name"]."/".escape($dir)."</option>\n";
+									}
+								}
 							}
 						}
 					}