diff --git a/src/main/java/kinosearch/webapp/WebAppController.java b/src/main/java/kinosearch/webapp/WebAppController.java
index 75e9511..7b0b102 100644
--- a/src/main/java/kinosearch/webapp/WebAppController.java
+++ b/src/main/java/kinosearch/webapp/WebAppController.java
@@ -180,8 +180,12 @@ public class WebAppController {
 
         con.connect();
 
-        int statusCode = con.getResponseCode(); //FIXME bug #20
+        int statusCode = con.getResponseCode();
         response.setStatus(statusCode);
+        if (statusCode != 200 && statusCode != 206) {
+            con.disconnect();
+            return;
+        }
 
         for (Map.Entry<String, List<String>> stringListEntry : con.getHeaderFields().entrySet()) {
             Map.Entry mapEntry = stringListEntry;