diff --git a/pom.xml b/pom.xml
index ca1987fb..20bbd548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.hisp</groupId>
   <artifactId>dhis2-java-client</artifactId>
-  <version>2.2.0</version>
+  <version>2.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>DHIS 2 API client for Java</name>
diff --git a/src/main/java/org/hisp/dhis/response/Response.java b/src/main/java/org/hisp/dhis/response/Response.java
index 4607d1d7..9a4eee63 100644
--- a/src/main/java/org/hisp/dhis/response/Response.java
+++ b/src/main/java/org/hisp/dhis/response/Response.java
@@ -68,7 +68,11 @@ public Response(Status status, Integer httpStatusCode, String message, String er
   }
 
   public HttpStatus getHttpStatus() {
-    return HttpStatus.valueOf(httpStatusCode);
+    if (httpStatusCode != null){
+      return HttpStatus.valueOf(httpStatusCode);
+    }
+
+    return HttpStatus.UNKNOWN_REASON_0;
   }
 
   /**