diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java
index b426ea6d07c..37f3b66cdf3 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java
@@ -87,7 +87,6 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen {
         apiPackage = packageName + ".Module";
         modelPackage = packageName + ".Model";
 
-        supportingFiles.add(new SupportingFile("ApiException.mustache", sourceFolder(), "ApiException.cs"));
         supportingFiles.add(new SupportingFile("RequestExtensions.mustache", sourceFolder(), "RequestExtensions.cs"));
         supportingFiles.add(new SupportingFile("packages.config.mustache", sourceFolder(), "packages.config"));
 
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/ApiException.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/ApiException.mustache
deleted file mode 100644
index ce6787e2d7b..00000000000
--- a/modules/swagger-codegen/src/main/resources/nancyfx/ApiException.mustache
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-
-namespace {{packageName}}.Module
-{
-    /// <summary>
-    /// API Exception
-    /// </summary>
-    public class ApiException : Exception
-    {
-        /// <summary>
-        /// Gets or sets the error code (HTTP status code)
-        /// </summary>
-        /// <value>The error code (HTTP status code).</value>
-        public int ErrorCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the error content (body json object)
-        /// </summary>
-        /// <value>The error content (Http response body).</value>
-        public {{#supportsAsync}}dynamic{{/supportsAsync}}{{^supportsAsync}}object{{/supportsAsync}} ErrorContent { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ApiException"/> class.
-        /// </summary>
-        public ApiException() {}
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ApiException"/> class.
-        /// </summary>
-        /// <param name="errorCode">HTTP status code.</param>
-        /// <param name="message">Error message.</param>
-        public ApiException(int errorCode, string message) : base(message)
-        {
-            this.ErrorCode = errorCode;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ApiException"/> class.
-        /// </summary>
-        /// <param name="errorCode">HTTP status code.</param>
-        /// <param name="message">Error message.</param>
-        /// <param name="errorContent">Error content.</param>
-        public ApiException(int errorCode, string message, {{#supportsAsync}}dynamic{{/supportsAsync}}{{^supportsAsync}}object{{/supportsAsync}} errorContent = null) : base(message)
-        {
-            this.ErrorCode = errorCode;
-            this.ErrorContent = errorContent;
-        }
-    }
-}
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
index 57c5e96b841..2ce03220f7c 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/api.mustache
@@ -1,3 +1,4 @@
+using System;
 using Nancy;
 using Nancy.ModelBinding;
 using System.Collections.Generic;
@@ -7,8 +8,7 @@ using {{packageName}}.Model;
 namespace {{packageName}}.Module
 { {{#operations}}
     {{#operation}}{{#allParams}}{{#isEnum}}{{>innerEnum}}
-    {{/isEnum}}{{#items.isEnum}}{{#items}}{{>innerEnum}}{{/items}}
-    {{/items.isEnum}}{{/allParams}}{{/operation}}
+    {{/isEnum}}{{/allParams}}{{/operation}}
 
     public sealed class {{classname}}Module : NancyModule
     {
@@ -17,7 +17,7 @@ namespace {{packageName}}.Module
             {{httpMethod}}["{{path}}"] = parameters =>
             { {{#allParams}}{{#required}}
                 if (parameters.{{paramName}} == null) {
-                    throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
+                    throw new ArgumentException("Missing the required parameter '{{paramName}}' when calling {{operationId}}");
                 }
                 {{/required}}{{/allParams}}{{#allParams}}{{#isBodyParam}}
                 var {{paramName}} = this.Bind<{{&dataType}}>();
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache
index a8c6ed3f54c..d6b07417ecc 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache
@@ -9,13 +9,10 @@ using Sharpility.Extensions;
 namespace {{packageName}}.Model
 {
     public sealed class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
-    {
-        {{#vars}}{{#isEnum}}
+    {   {{#vars}}{{#isEnum}}
         {{>innerEnum}}{{/isEnum}}{{#items.isEnum}}
-        {{#items}}{{>innerEnum}}{{/items}}
-        {{/items.isEnum}}{{/vars}}{{#vars}}
-        public {{>nullableDataType}} {{name}} { get; private set; }
-        {{/vars}}
+        {{#items}}{{>innerEnum}}{{/items}}{{/items.isEnum}}{{/vars}}{{#vars}}
+        public {{>nullableDataType}} {{name}} { get; private set; }{{/vars}}
 
         public {{classname}}({{#vars}}{{>nullableDataType}} {{name}} = null{{#hasMore}}, {{/hasMore}}{{/vars}})
         {
diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/requestExtensions.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/requestExtensions.mustache
index d3ef4828b9c..3725af75230 100644
--- a/modules/swagger-codegen/src/main/resources/nancyfx/requestExtensions.mustache
+++ b/modules/swagger-codegen/src/main/resources/nancyfx/requestExtensions.mustache
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;