diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index dbaac08..9f908de 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -164,7 +164,7 @@
     auth_discovery = {}
 
   if model is None:
-    model = JsonModel('dataWrapper' in service.get('features', []))
+    model = JsonModel('dataWrapper' in service.get('features', ['dataWrapper']))
   resource = createResource(http, base, model, requestBuilder, developerKey,
                        service, future)
 
diff --git a/apiclient/model.py b/apiclient/model.py
index 14ec397..9781b35 100644
--- a/apiclient/model.py
+++ b/apiclient/model.py
@@ -73,7 +73,7 @@
   object representation of HTTP request and response bodies.
   """
 
-  def __init__(self, data_wrapper):
+  def __init__(self, data_wrapper=False):
     """Construct a JsonModel
 
     Args: