diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java
index eae094e6335a..8ee22c57c846 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java
@@ -1,29 +1,31 @@
 package io.swagger.codegen.languages;
 
-import io.swagger.codegen.*;
-import io.swagger.models.properties.*;
-import io.swagger.models.parameters.*;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
 import io.swagger.models.Model;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
+import io.swagger.models.parameters.BodyParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.parameters.SerializableParameter;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
-
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import java.util.HashMap;
+
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.*;
-import java.io.File;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.Set;
 
 public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
 
@@ -571,16 +573,17 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
         List codesamples = (List)op.vendorExtensions.get("x-code-samples");
 
         for (Object codesample : codesamples) {
-          ObjectNode codesample_object = (ObjectNode)codesample;
+            if(codesample instanceof ObjectNode) {
+                ObjectNode codesample_object = (ObjectNode) codesample;
 
-          if((codesample_object.get("lang").asText()).equals("Shell")) {
+                if ((codesample_object.get("lang").asText()).equals("Shell")) {
 
-            op.vendorExtensions.put("x-bash-codegen-sample",
-              escapeUnsafeCharacters(
-                codesample_object.get("source").asText()));
-
-          }
+                    op.vendorExtensions.put("x-bash-codegen-sample",
+                            escapeUnsafeCharacters(
+                                    codesample_object.get("source").asText()));
 
+                }
+            }
         }
       }
 
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/bash/BashTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/bash/BashTest.java
index 4f355723a7f1..dec0d8ddd4af 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/bash/BashTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/bash/BashTest.java
@@ -1,30 +1,14 @@
 package io.swagger.codegen.bash;
 
-import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.languages.BashClientCodegen;
-import io.swagger.models.ArrayModel;
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.DateTimeProperty;
-import io.swagger.models.properties.LongProperty;
-import io.swagger.models.properties.MapProperty;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
 import io.swagger.parser.SwaggerParser;
-
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import org.testng.annotations.ITestAnnotation;
-
-import com.google.common.collect.Sets;
-import java.util.Map;
 
 @SuppressWarnings("static-method")
 public class BashTest {
@@ -48,7 +32,7 @@ public class BashTest {
                 swagger);
 
         Assert.assertTrue(
-            op.vendorExtensions.containsKey("x-bash-codegen-sample"));
+            op.vendorExtensions.containsKey("x-code-samples"));
 
         Assert.assertEquals(
             op.vendorExtensions.get("x-bash-codegen-description"),
diff --git a/pom.xml b/pom.xml
index 097a1cdb6af7..315c8ad5cf71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -869,7 +869,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.26</swagger-parser-version>
+        <swagger-parser-version>1.0.27-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>2.3.4</felix-version>
         <swagger-core-version>1.5.12</swagger-core-version>