diff --git a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
index 8b021a3badd..0588d03a8c1 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/model.mustache
@@ -12,34 +12,37 @@ if (typeof module === 'object' && module.exports) {
 
 //export module
 if ( typeof define === "function" && define.amd ) {
-	define('{{classname}}', ['jquery'{{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}'{{datatypeWithEnum}}'{{/isPrimitiveType}}{{/vars}}],
-		function(${{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}{{datatypeWithEnum}}{{/isPrimitiveType}}{{/vars}}) {
-        return {{classname}};
-	 });
+  define('{{classname}}', ['jquery'{{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}'{{datatypeWithEnum}}'{{/isPrimitiveType}}{{/vars}}],
+    function(${{#vars}}{{^isPrimitiveType}}{{^-last}}, {{/-last}}{{datatypeWithEnum}}{{/isPrimitiveType}}{{/vars}}) {
+      return {{classname}};
+   });
 }
 
 {{#description}}/**
  * {{description}}
  **/{{/description}}
 var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/-last}}{{/mandatory}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
-  	var self = this;
-  	{{#vars}}
-  	/**{{#description}}
-	  * {{{description}}}{{/description}}
-	  * datatype: {{{datatypeWithEnum}}}{{#required}}
-	  * required{{/required}}{{#minimum}}
-	  * minimum: {{minimum}}{{/minimum}}{{#maximum}}
-	  * maximum: {{maximum}}{{/maximum}}
-	  **/
-	  self.{{name}} = {{#required}}{{name}}{{/required}}{{^required}}{{{defaultValue}}}{{/required}};
-	 {{/vars}}
-  
-  	self.constructFromObject = function(data) {
-	  	{{#vars}}
-	  	self.{{name}}{{{defaultValueWithParam}}}
-	  	{{/vars}}
-	}
+  var self = this;
+  {{#vars}}
+  /**{{#description}}
+   * {{{description}}}{{/description}}
+   * datatype: {{{datatypeWithEnum}}}{{#required}}
+   * required{{/required}}{{#minimum}}
+   * minimum: {{minimum}}{{/minimum}}{{#maximum}}
+   * maximum: {{maximum}}{{/maximum}}
+   **/
+  self.{{name}} = {{#required}}{{name}}{{/required}}{{^required}}{{{defaultValue}}}{{/required}};
+  {{/vars}}
   
+  self.constructFromObject = function(data) {
+    if (!data) {
+      return;
+    }
+    {{#vars}}
+    self.{{name}}{{{defaultValueWithParam}}}
+    {{/vars}}
+  }
+
   {{#vars}}
   /**{{#description}}
    * get {{{description}}}{{/description}}{{#minimum}}
@@ -50,7 +53,7 @@ var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/
   self.{{getter}} = function() {
     return self.{{name}};
   }
-  
+
   /**{{#description}}
    * set {{{description}}}{{/description}}
    * @param {{=<% %>=}}{<% datatypeWithEnum %>}<%={{ }}=%> {{name}}
@@ -61,7 +64,7 @@ var {{classname}} = function {{classname}}({{#mandatory}}{{this}}{{^-last}}, {{/
   {{/vars}}
 
   self.toJson = function () {
-  	return JSON.stringify(self);
+    return JSON.stringify(self);
   }
 }
 
diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js
index a87f91354a8..ff40497a61a 100644
--- a/samples/client/petstore/javascript/src/model/Category.js
+++ b/samples/client/petstore/javascript/src/model/Category.js
@@ -9,35 +9,38 @@ if (typeof module === 'object' && module.exports) {
 
 //export module
 if ( typeof define === "function" && define.amd ) {
-	define('Category', ['jquery'],
-		function($) {
-        return Category;
-	 });
+  define('Category', ['jquery'],
+    function($) {
+      return Category;
+   });
 }
 
 
 var Category = function Category() { 
-  	var self = this;
-  	
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.id = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.name = null;
-	 
+  var self = this;
   
-  	self.constructFromObject = function(data) {
-	  	
-	  	self.id = data.id;
-	  	
-	  	self.name = data.name;
-	  	
-	}
+  /**
+   * datatype: Integer
+   **/
+  self.id = null;
   
+  /**
+   * datatype: String
+   **/
+  self.name = null;
+  
+  
+  self.constructFromObject = function(data) {
+    if (!data) {
+      return;
+    }
+    
+    self.id = data.id;
+    
+    self.name = data.name;
+    
+  }
+
   
   /**
    * @return {Integer}
@@ -45,7 +48,7 @@ var Category = function Category() {
   self.getId = function() {
     return self.id;
   }
-  
+
   /**
    * @param {Integer} id
    **/
@@ -59,7 +62,7 @@ var Category = function Category() {
   self.getName = function() {
     return self.name;
   }
-  
+
   /**
    * @param {String} name
    **/
@@ -69,7 +72,7 @@ var Category = function Category() {
   
 
   self.toJson = function () {
-  	return JSON.stringify(self);
+    return JSON.stringify(self);
   }
 }
 
diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js
index 61120e577d6..3cf2335b535 100644
--- a/samples/client/petstore/javascript/src/model/Order.js
+++ b/samples/client/petstore/javascript/src/model/Order.js
@@ -37,64 +37,67 @@ var StatusEnum = function StatusEnum() {
 
 //export module
 if ( typeof define === "function" && define.amd ) {
-	define('Order', ['jquery'],
-		function($) {
-        return Order;
-	 });
+  define('Order', ['jquery'],
+    function($) {
+      return Order;
+   });
 }
 
 
 var Order = function Order() { 
-  	var self = this;
-  	
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.id = null;
-	 
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.petId = null;
-	 
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.quantity = null;
-	 
-  	/**
-	  * datatype: Date
-	  **/
-	  self.shipDate = null;
-	 
-  	/**
-	  * Order Status
-	  * datatype: StatusEnum
-	  **/
-	  self.status = null;
-	 
-  	/**
-	  * datatype: Boolean
-	  **/
-	  self.complete = null;
-	 
+  var self = this;
   
-  	self.constructFromObject = function(data) {
-	  	
-	  	self.id = data.id;
-	  	
-	  	self.petId = data.petId;
-	  	
-	  	self.quantity = data.quantity;
-	  	
-	  	self.shipDate = data.shipDate;
-	  	
-	  	self.status = data.status;
-	  	
-	  	self.complete = data.complete;
-	  	
-	}
+  /**
+   * datatype: Integer
+   **/
+  self.id = null;
   
+  /**
+   * datatype: Integer
+   **/
+  self.petId = null;
+  
+  /**
+   * datatype: Integer
+   **/
+  self.quantity = null;
+  
+  /**
+   * datatype: Date
+   **/
+  self.shipDate = null;
+  
+  /**
+   * Order Status
+   * datatype: StatusEnum
+   **/
+  self.status = null;
+  
+  /**
+   * datatype: Boolean
+   **/
+  self.complete = null;
+  
+  
+  self.constructFromObject = function(data) {
+    if (!data) {
+      return;
+    }
+    
+    self.id = data.id;
+    
+    self.petId = data.petId;
+    
+    self.quantity = data.quantity;
+    
+    self.shipDate = data.shipDate;
+    
+    self.status = data.status;
+    
+    self.complete = data.complete;
+    
+  }
+
   
   /**
    * @return {Integer}
@@ -102,7 +105,7 @@ var Order = function Order() {
   self.getId = function() {
     return self.id;
   }
-  
+
   /**
    * @param {Integer} id
    **/
@@ -116,7 +119,7 @@ var Order = function Order() {
   self.getPetId = function() {
     return self.petId;
   }
-  
+
   /**
    * @param {Integer} petId
    **/
@@ -130,7 +133,7 @@ var Order = function Order() {
   self.getQuantity = function() {
     return self.quantity;
   }
-  
+
   /**
    * @param {Integer} quantity
    **/
@@ -144,7 +147,7 @@ var Order = function Order() {
   self.getShipDate = function() {
     return self.shipDate;
   }
-  
+
   /**
    * @param {Date} shipDate
    **/
@@ -159,7 +162,7 @@ var Order = function Order() {
   self.getStatus = function() {
     return self.status;
   }
-  
+
   /**
    * set Order Status
    * @param {StatusEnum} status
@@ -174,7 +177,7 @@ var Order = function Order() {
   self.getComplete = function() {
     return self.complete;
   }
-  
+
   /**
    * @param {Boolean} complete
    **/
@@ -184,7 +187,7 @@ var Order = function Order() {
   
 
   self.toJson = function () {
-  	return JSON.stringify(self);
+    return JSON.stringify(self);
   }
 }
 
diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js
index 7a25a1d5fdd..25ae2e951c8 100644
--- a/samples/client/petstore/javascript/src/model/Pet.js
+++ b/samples/client/petstore/javascript/src/model/Pet.js
@@ -39,66 +39,69 @@ var StatusEnum = function StatusEnum() {
 
 //export module
 if ( typeof define === "function" && define.amd ) {
-	define('Pet', ['jquery', 'Category', 'Array'],
-		function($, Category, Array) {
-        return Pet;
-	 });
+  define('Pet', ['jquery', 'Category', 'Array'],
+    function($, Category, Array) {
+      return Pet;
+   });
 }
 
 
 var Pet = function Pet(photoUrls, name) { 
-  	var self = this;
-  	
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.id = null;
-	 
-  	/**
-	  * datatype: Category
-	  **/
-	  self.category = new Category();
-	 
-  	/**
-	  * datatype: String
-	  * required
-	  **/
-	  self.name = name;
-	 
-  	/**
-	  * datatype: Array
-	  * required
-	  **/
-	  self.photoUrls = photoUrls;
-	 
-  	/**
-	  * datatype: Array
-	  **/
-	  self.tags = [];
-	 
-  	/**
-	  * pet status in the store
-	  * datatype: StatusEnum
-	  **/
-	  self.status = null;
-	 
+  var self = this;
   
-  	self.constructFromObject = function(data) {
-	  	
-	  	self.id = data.id;
-	  	
-	  	self.category.constructFromObject(data.category);
-	  	
-	  	self.name = data.name;
-	  	
-	  	self.photoUrls = new Array();
-	  	
-	  	self.tags = new Array();
-	  	
-	  	self.status = data.status;
-	  	
-	}
+  /**
+   * datatype: Integer
+   **/
+  self.id = null;
   
+  /**
+   * datatype: Category
+   **/
+  self.category = new Category();
+  
+  /**
+   * datatype: String
+   * required
+   **/
+  self.name = name;
+  
+  /**
+   * datatype: Array
+   * required
+   **/
+  self.photoUrls = photoUrls;
+  
+  /**
+   * datatype: Array
+   **/
+  self.tags = [];
+  
+  /**
+   * pet status in the store
+   * datatype: StatusEnum
+   **/
+  self.status = null;
+  
+  
+  self.constructFromObject = function(data) {
+    if (!data) {
+      return;
+    }
+    
+    self.id = data.id;
+    
+    self.category.constructFromObject(data.category);
+    
+    self.name = data.name;
+    
+    self.photoUrls = new Array();
+    
+    self.tags = new Array();
+    
+    self.status = data.status;
+    
+  }
+
   
   /**
    * @return {Integer}
@@ -106,7 +109,7 @@ var Pet = function Pet(photoUrls, name) {
   self.getId = function() {
     return self.id;
   }
-  
+
   /**
    * @param {Integer} id
    **/
@@ -120,7 +123,7 @@ var Pet = function Pet(photoUrls, name) {
   self.getCategory = function() {
     return self.category;
   }
-  
+
   /**
    * @param {Category} category
    **/
@@ -134,7 +137,7 @@ var Pet = function Pet(photoUrls, name) {
   self.getName = function() {
     return self.name;
   }
-  
+
   /**
    * @param {String} name
    **/
@@ -148,7 +151,7 @@ var Pet = function Pet(photoUrls, name) {
   self.getPhotoUrls = function() {
     return self.photoUrls;
   }
-  
+
   /**
    * @param {Array} photoUrls
    **/
@@ -162,7 +165,7 @@ var Pet = function Pet(photoUrls, name) {
   self.getTags = function() {
     return self.tags;
   }
-  
+
   /**
    * @param {Array} tags
    **/
@@ -177,7 +180,7 @@ var Pet = function Pet(photoUrls, name) {
   self.getStatus = function() {
     return self.status;
   }
-  
+
   /**
    * set pet status in the store
    * @param {StatusEnum} status
@@ -188,7 +191,7 @@ var Pet = function Pet(photoUrls, name) {
   
 
   self.toJson = function () {
-  	return JSON.stringify(self);
+    return JSON.stringify(self);
   }
 }
 
diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js
index 4801da71e41..0fa97bd8c78 100644
--- a/samples/client/petstore/javascript/src/model/Tag.js
+++ b/samples/client/petstore/javascript/src/model/Tag.js
@@ -9,35 +9,38 @@ if (typeof module === 'object' && module.exports) {
 
 //export module
 if ( typeof define === "function" && define.amd ) {
-	define('Tag', ['jquery'],
-		function($) {
-        return Tag;
-	 });
+  define('Tag', ['jquery'],
+    function($) {
+      return Tag;
+   });
 }
 
 
 var Tag = function Tag() { 
-  	var self = this;
-  	
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.id = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.name = null;
-	 
+  var self = this;
   
-  	self.constructFromObject = function(data) {
-	  	
-	  	self.id = data.id;
-	  	
-	  	self.name = data.name;
-	  	
-	}
+  /**
+   * datatype: Integer
+   **/
+  self.id = null;
   
+  /**
+   * datatype: String
+   **/
+  self.name = null;
+  
+  
+  self.constructFromObject = function(data) {
+    if (!data) {
+      return;
+    }
+    
+    self.id = data.id;
+    
+    self.name = data.name;
+    
+  }
+
   
   /**
    * @return {Integer}
@@ -45,7 +48,7 @@ var Tag = function Tag() {
   self.getId = function() {
     return self.id;
   }
-  
+
   /**
    * @param {Integer} id
    **/
@@ -59,7 +62,7 @@ var Tag = function Tag() {
   self.getName = function() {
     return self.name;
   }
-  
+
   /**
    * @param {String} name
    **/
@@ -69,7 +72,7 @@ var Tag = function Tag() {
   
 
   self.toJson = function () {
-  	return JSON.stringify(self);
+    return JSON.stringify(self);
   }
 }
 
diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js
index 6d32676a921..632208a523c 100644
--- a/samples/client/petstore/javascript/src/model/User.js
+++ b/samples/client/petstore/javascript/src/model/User.js
@@ -9,78 +9,81 @@ if (typeof module === 'object' && module.exports) {
 
 //export module
 if ( typeof define === "function" && define.amd ) {
-	define('User', ['jquery'],
-		function($) {
-        return User;
-	 });
+  define('User', ['jquery'],
+    function($) {
+      return User;
+   });
 }
 
 
 var User = function User() { 
-  	var self = this;
-  	
-  	/**
-	  * datatype: Integer
-	  **/
-	  self.id = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.username = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.firstName = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.lastName = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.email = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.password = null;
-	 
-  	/**
-	  * datatype: String
-	  **/
-	  self.phone = null;
-	 
-  	/**
-	  * User Status
-	  * datatype: Integer
-	  **/
-	  self.userStatus = null;
-	 
+  var self = this;
   
-  	self.constructFromObject = function(data) {
-	  	
-	  	self.id = data.id;
-	  	
-	  	self.username = data.username;
-	  	
-	  	self.firstName = data.firstName;
-	  	
-	  	self.lastName = data.lastName;
-	  	
-	  	self.email = data.email;
-	  	
-	  	self.password = data.password;
-	  	
-	  	self.phone = data.phone;
-	  	
-	  	self.userStatus = data.userStatus;
-	  	
-	}
+  /**
+   * datatype: Integer
+   **/
+  self.id = null;
   
+  /**
+   * datatype: String
+   **/
+  self.username = null;
+  
+  /**
+   * datatype: String
+   **/
+  self.firstName = null;
+  
+  /**
+   * datatype: String
+   **/
+  self.lastName = null;
+  
+  /**
+   * datatype: String
+   **/
+  self.email = null;
+  
+  /**
+   * datatype: String
+   **/
+  self.password = null;
+  
+  /**
+   * datatype: String
+   **/
+  self.phone = null;
+  
+  /**
+   * User Status
+   * datatype: Integer
+   **/
+  self.userStatus = null;
+  
+  
+  self.constructFromObject = function(data) {
+    if (!data) {
+      return;
+    }
+    
+    self.id = data.id;
+    
+    self.username = data.username;
+    
+    self.firstName = data.firstName;
+    
+    self.lastName = data.lastName;
+    
+    self.email = data.email;
+    
+    self.password = data.password;
+    
+    self.phone = data.phone;
+    
+    self.userStatus = data.userStatus;
+    
+  }
+
   
   /**
    * @return {Integer}
@@ -88,7 +91,7 @@ var User = function User() {
   self.getId = function() {
     return self.id;
   }
-  
+
   /**
    * @param {Integer} id
    **/
@@ -102,7 +105,7 @@ var User = function User() {
   self.getUsername = function() {
     return self.username;
   }
-  
+
   /**
    * @param {String} username
    **/
@@ -116,7 +119,7 @@ var User = function User() {
   self.getFirstName = function() {
     return self.firstName;
   }
-  
+
   /**
    * @param {String} firstName
    **/
@@ -130,7 +133,7 @@ var User = function User() {
   self.getLastName = function() {
     return self.lastName;
   }
-  
+
   /**
    * @param {String} lastName
    **/
@@ -144,7 +147,7 @@ var User = function User() {
   self.getEmail = function() {
     return self.email;
   }
-  
+
   /**
    * @param {String} email
    **/
@@ -158,7 +161,7 @@ var User = function User() {
   self.getPassword = function() {
     return self.password;
   }
-  
+
   /**
    * @param {String} password
    **/
@@ -172,7 +175,7 @@ var User = function User() {
   self.getPhone = function() {
     return self.phone;
   }
-  
+
   /**
    * @param {String} phone
    **/
@@ -187,7 +190,7 @@ var User = function User() {
   self.getUserStatus = function() {
     return self.userStatus;
   }
-  
+
   /**
    * set User Status
    * @param {Integer} userStatus
@@ -198,7 +201,7 @@ var User = function User() {
   
 
   self.toJson = function () {
-  	return JSON.stringify(self);
+    return JSON.stringify(self);
   }
 }