diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java b/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java
index 45ae3be253..5041c0cfb2 100644
--- a/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java
+++ b/modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java
@@ -95,7 +95,7 @@ public SwaggerDeserializationResult readWithInfo(String swaggerAsString) {
     }
 
     public SwaggerDeserializationResult readWithInfo(String swaggerAsString, boolean resolve) {
-        if (swaggerAsString == null) {
+        if (swaggerAsString == null || swaggerAsString.trim().isEmpty()) {
             return new SwaggerDeserializationResult().message("empty or null swagger supplied");
         }
         try {
diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java
index 461fdc0617..22f97e24df 100644
--- a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java
+++ b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java
@@ -54,6 +54,12 @@
 
 public class SwaggerParserTest {
 
+    @Test
+    public void testIssue845() {
+        SwaggerDeserializationResult swaggerDeserializationResult = new SwaggerParser().readWithInfo("");
+        assertEquals(swaggerDeserializationResult.getMessages().get(0), "empty or null swagger supplied");
+    }
+  
     @Test
     public void testIssue834() {
         Swagger swagger = new SwaggerParser().read("issue-834/index.yaml", null, true);
@@ -86,7 +92,6 @@ public void testIssue811_RefSchema_ToRefSchema() {
         Assert.assertEquals(model.get$ref() ,"#/definitions/schema-with-reference");
     }
 
-
     @Test
     public void testIssue811() throws Exception {
         SwaggerParser parser = new SwaggerParser();