diff --git a/modules/swagger-models/src/main/java/io/swagger/models/Operation.java b/modules/swagger-models/src/main/java/io/swagger/models/Operation.java
index 4c86ca975e..f32ef07538 100644
--- a/modules/swagger-models/src/main/java/io/swagger/models/Operation.java
+++ b/modules/swagger-models/src/main/java/io/swagger/models/Operation.java
@@ -218,10 +218,12 @@ public Map<String, Response> getResponses() {
             responses = new Responses();
             responses.putAll(responsesObject);
         }
-        return responsesObject;
+        if (responsesObject != null) {
+            responses.putAll(responsesObject);
+        }
+        return responses;
     }
 
-
     public Responses getResponsesObject() {
         if (responsesObject == null && responses != null) {
             responsesObject = new Responses();