diff --git a/python-portasclient/portasclient/common/base.py b/python-portasclient/portasclient/common/base.py
index 47a4afd..4115a84 100644
--- a/python-portasclient/portasclient/common/base.py
+++ b/python-portasclient/portasclient/common/base.py
@@ -56,6 +56,8 @@ class Manager(object):
             obj_class = self.resource_class
 
         if response_key:
+            if not body.has_key(response_key):
+                body[response_key] = []
             data = body[response_key]
         else:
             data = body
diff --git a/python-portasclient/portasclient/v1/services.py b/python-portasclient/portasclient/v1/services.py
index f58bbbf..84a76f1 100644
--- a/python-portasclient/portasclient/v1/services.py
+++ b/python-portasclient/portasclient/v1/services.py
@@ -54,7 +54,7 @@ class WebServer(base.Resource):
 
 
 class WebServerManager(base.Manager):
-    resource_class = ActiveDirectory
+    resource_class = WebServer
 
     def list(self, environment_id, session_id):
         headers = {'X-Configuration-Session': session_id}