diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index cb973aac8..f63145521 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -471,7 +471,7 @@ include("head.inc");
 						}
 						/* tack on PPPoE or PPtP servers here */
 						/* pppoe server */
-						if (is_array($config['pppoes']['pppoe'])) {
+						if (isset($config['pppoes']['pppoe'])) {
 							foreach($config['pppoes']['pppoe'] as $pppoe) {
 								if ($pppoe['mode'] == "server") {
 									$ifent = "poes". $pppoe['pppoeid'];
diff --git a/src/www/vpn_pppoe.php b/src/www/vpn_pppoe.php
index 366bc55f8..1c5b90116 100644
--- a/src/www/vpn_pppoe.php
+++ b/src/www/vpn_pppoe.php
@@ -52,7 +52,7 @@ if ($_POST) {
                 if (!is_numeric($pppoeid)) {
                     continue;
                 }
-                if (is_array($config['pppoes']['pppoe'])) {
+                if (isset($config['pppoes']['pppoe'])) {
                     foreach ($config['pppoes']['pppoe'] as $pppoe) {
                         if ($pppoe['pppoeid'] == $pppoeid) {
                             vpn_pppoe_configure($pppoe);
diff --git a/src/www/vpn_pppoe_edit.php b/src/www/vpn_pppoe_edit.php
index c04831412..1f2613c0e 100644
--- a/src/www/vpn_pppoe_edit.php
+++ b/src/www/vpn_pppoe_edit.php
@@ -37,7 +37,8 @@ function vpn_pppoe_get_id()
     global $config;
 
     $vpnid = 1;
-    if (is_array($config['pppoes']['pppoe'])) {
+
+    if (isset($config['pppoes']['pppoe'])) {
         foreach ($config['pppoes']['pppoe'] as $pppoe) {
             if ($vpnid == $pppoe['pppoeid']) {
                 $vpnid++;