diff --git a/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/MainApiVerticle.mustache b/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/MainApiVerticle.mustache
index ec21324..089a3c0 100644
--- a/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/MainApiVerticle.mustache
+++ b/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/MainApiVerticle.mustache
@@ -25,7 +25,7 @@ public class MainApiVerticle extends AbstractVerticle {
     
     @Override
     public void start(Future<Void> startFuture) throws Exception {
-    	LOGGER.info("Starting MainApiVerticle");
+    	LOGGER.info("Starting MainApiVerticle...");
         Json.mapper.registerModule(new JavaTimeModule());
     	FileSystem vertxFileSystem = vertx.fileSystem();
         vertxFileSystem.readFile("swagger.json", readFile -> {
diff --git a/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/pojo.mustache b/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/pojo.mustache
index 438f013..3758409 100644
--- a/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/pojo.mustache
+++ b/modules/vertx-swagger-codegen/src/main/resources/javaVertXServer/pojo.mustache
@@ -1,22 +1,21 @@
 @JsonInclude(JsonInclude.Include.NON_NULL) 
-public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
+public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
 
 {{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
-
 {{>enumClass}}{{/items}}{{/items.isEnum}}
   private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
 
   public {{classname}} () {
 
   }
-
+  {{#vars}}{{#-first}}
   public {{classname}} ({{#vars}}{{{datatypeWithEnum}}} {{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}) {
     {{#vars}}
     this.{{name}} = {{name}};
     {{/vars}}
   }
-
+  {{/-first}}{{/vars}}
   {{#vars}}
     {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
   @JsonProperty("{{baseName}}")
@@ -28,6 +27,17 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
 
+  {{#isMapContainer}}
+  public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
+    this.{{name}}.put(key, {{name}}Item);
+    return this;
+  }
+  {{/isMapContainer}}
   {{/vars}}
 
   @Override
diff --git a/modules/vertx-swagger-router/src/main/java/com/github/phiz71/vertx/swagger/router/SwaggerRouter.java b/modules/vertx-swagger-router/src/main/java/com/github/phiz71/vertx/swagger/router/SwaggerRouter.java
index 4405f01..84c5b29 100644
--- a/modules/vertx-swagger-router/src/main/java/com/github/phiz71/vertx/swagger/router/SwaggerRouter.java
+++ b/modules/vertx-swagger-router/src/main/java/com/github/phiz71/vertx/swagger/router/SwaggerRouter.java
@@ -202,8 +202,10 @@ private static void configureRoute(Route route, String serviceId, Operation oper
 						}
 					} catch (Throwable t) {
 						vertxLogger.error("Internal Server Error", t);
-						response.setStatusCode(HttpResponseStatus.INTERNAL_SERVER_ERROR.code());
-						response.end();
+						if (!response.ended()) {
+							response.setStatusCode(HttpResponseStatus.INTERNAL_SERVER_ERROR.code());
+							response.end();
+						}
 					}
 				});
 			} catch (Exception e) {