diff --git a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
index 06484a1afba..a031cf58487 100644
--- a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
@@ -73,6 +73,9 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd
         List<Site2SiteVpnConnectionResponse> connResponses = new ArrayList<Site2SiteVpnConnectionResponse>();
         if (conns != null && !conns.isEmpty()) {
             for (Site2SiteVpnConnection conn : conns) {
+                if (conn == null) {
+                    continue;
+                }
             	Site2SiteVpnConnectionResponse site2SiteVpnConnectonRes = _responseGenerator.createSite2SiteVpnConnectionResponse(conn);
             	site2SiteVpnConnectonRes.setObjectName("vpnconnection");
                 connResponses.add(site2SiteVpnConnectonRes);
diff --git a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
index 4f1488b68c5..224f7e84169 100644
--- a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
@@ -65,6 +65,9 @@ public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourc
         List<Site2SiteCustomerGatewayResponse> gwResponses = new ArrayList<Site2SiteCustomerGatewayResponse>();
         if (gws != null && !gws.isEmpty()) {
             for (Site2SiteCustomerGateway gw : gws) {
+                if (gw == null) {
+                    continue;
+                }
             	Site2SiteCustomerGatewayResponse site2SiteCustomerGatewayRes = _responseGenerator.createSite2SiteCustomerGatewayResponse(gw);
             	site2SiteCustomerGatewayRes.setObjectName("vpncustomergateway");
                 gwResponses.add(site2SiteCustomerGatewayRes);
diff --git a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
index 1cf215126fe..3900a4f2720 100644
--- a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
@@ -72,6 +72,9 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
         List<Site2SiteVpnGatewayResponse> gwResponses = new ArrayList<Site2SiteVpnGatewayResponse>();
         if (gws != null && !gws.isEmpty()) {
             for (Site2SiteVpnGateway gw : gws) {
+                if (gw == null) {
+                    continue;
+                }
             	Site2SiteVpnGatewayResponse site2SiteVpnGatewayRes = _responseGenerator.createSite2SiteVpnGatewayResponse(gw);
             	site2SiteVpnGatewayRes.setObjectName("vpngateway");
                 gwResponses.add(site2SiteVpnGatewayRes);