diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
index c40c1b4b4d5..ea721a1bc3e 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -564,6 +564,9 @@ class ApiClient(object):
         """
         instance = klass()
 
+        if not instance.swagger_types:
+            return data
+
         for attr, attr_type in iteritems(instance.swagger_types):
             if data is not None \
                and instance.attribute_map[attr] in data\
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index a2482fc1c6d..9d658c783f6 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-08-27T14:30:36.450+03:00
+- Build date: 2016-08-29T16:39:50.642+02:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
index 81ecfb95c06..c4096d4bc63 100644
--- a/samples/client/petstore/python/petstore_api/api_client.py
+++ b/samples/client/petstore/python/petstore_api/api_client.py
@@ -564,6 +564,9 @@ class ApiClient(object):
         """
         instance = klass()
 
+        if not instance.swagger_types:
+            return data
+
         for attr, attr_type in iteritems(instance.swagger_types):
             if data is not None \
                and instance.attribute_map[attr] in data\