diff --git a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
index 5cbf8f3d60d..96cc0611e9d 100644
--- a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
@@ -68,8 +68,13 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd
         ListResponse<Site2SiteVpnConnectionResponse> response = new ListResponse<Site2SiteVpnConnectionResponse>();
         List<Site2SiteVpnConnectionResponse> connResponses = new ArrayList<Site2SiteVpnConnectionResponse>();
         if (conns != null && !conns.isEmpty()) {
-            for (Site2SiteVpnConnection conn : conns) {
-                connResponses.add(_responseGenerator.createSite2SiteVpnConnectionResponse(conn));
+        	for (Site2SiteVpnConnection conn : conns) {
+                if (conn == null) {
+                    continue;
+                }
+            	Site2SiteVpnConnectionResponse site2SiteVpnConnectonRes = _responseGenerator.createSite2SiteVpnConnectionResponse(conn);
+            	site2SiteVpnConnectonRes.setObjectName("vpnconnection");
+                connResponses.add(site2SiteVpnConnectonRes);
             }
         }
         response.setResponses(connResponses);
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index f9572230562..e01bcd29700 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3793,6 +3793,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         response.setCustomerGatewayId(result.getCustomerGatewayId());
         response.setCreated(result.getCreated());
         response.setRemoved(result.getRemoved());
+        response.setObjectName("vpnconnection");
         return response;
     }
 }