diff --git a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
index d479f8922f7..a147788b394 100644
--- a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
@@ -68,9 +68,14 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
         ListResponse<Site2SiteVpnGatewayResponse> response = new ListResponse<Site2SiteVpnGatewayResponse>();
         List<Site2SiteVpnGatewayResponse> gwResponses = new ArrayList<Site2SiteVpnGatewayResponse>();
         if (gws != null && !gws.isEmpty()) {
-            for (Site2SiteVpnGateway gw : gws) {
-                gwResponses.add(_responseGenerator.createSite2SiteVpnGatewayResponse(gw));
-            }
+        	 for (Site2SiteVpnGateway gw : gws) {
+                 if (gw == null) {
+                     continue;
+                 }
+             	Site2SiteVpnGatewayResponse site2SiteVpnGatewayRes = _responseGenerator.createSite2SiteVpnGatewayResponse(gw);
+             	site2SiteVpnGatewayRes.setObjectName("vpngateway");
+                 gwResponses.add(site2SiteVpnGatewayRes);
+             }
         }
         response.setResponses(gwResponses);
         response.setResponseName(getCommandName());
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index b64b528a9e7..898c676ddae 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3765,10 +3765,16 @@ public class ApiResponseHelper implements ResponseGenerator {
     
     @Override
     public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVpnGateway result) {
-        Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse();
+    	Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse();
         response.setId(result.getId());
         response.setIp(ApiDBUtils.findIpAddressById(result.getAddrId()).getAddress().toString());
+        response.setVpcId(result.getVpcId());
         response.setRemoved(result.getRemoved());
+        response.setObjectName("vpngateway");
+        
+        populateAccount(response, result.getAccountId());
+        populateDomain(response, result.getDomainId());
+        
         return response;
     }