Fix issue #133

Author: mpv1989

src/main/java/com/arangodb/ArangoCollection.java

@@ -242,7 +242,9 @@ public <T> T getDocument(final String key, final Class<T> type, final DocumentRe
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug(e.getMessage(), e);
 			}
-			if (options == null || options.isCatchException()) {
+			if ((e.getResponseCode() != null && (e.getResponseCode().intValue() == 404
+					|| e.getResponseCode().intValue() == 304 || e.getResponseCode().intValue() == 412))
+					&& (options == null || options.isCatchException())) {
 				return null;
 			}
 			throw e;
@@ -532,7 +534,9 @@ public Boolean documentExists(final String key, final DocumentExistsOptions opti
 			executor.execute(documentExistsRequest(key, options), VPackSlice.class);
 			return true;
 		} catch (final ArangoDBException e) {
-			if (options == null || options.isCatchException()) {
+			if ((e.getResponseCode() != null && (e.getResponseCode().intValue() == 404
+					|| e.getResponseCode().intValue() == 304 || e.getResponseCode().intValue() == 412))
+					&& (options == null || options.isCatchException())) {
 				return false;
 			}
 			throw e;

src/main/java/com/arangodb/ArangoDBException.java

@@ -30,6 +30,7 @@ public class ArangoDBException extends RuntimeException {
 
 	private static final long serialVersionUID = 6165638002614173801L;
 	private ErrorEntity entity = null;
+	private Integer responseCode;
 
 	public ArangoDBException(final ErrorEntity errorEntity) {
 		super(String.format("Response: %s, Error: %s - %s", errorEntity.getCode(), errorEntity.getErrorNum(),
@@ -41,6 +42,11 @@ public ArangoDBException(final String message) {
 		super(message);
 	}
 
+	public ArangoDBException(final String message, final Integer responseCode) {
+		super(message);
+		this.responseCode = responseCode;
+	}
+
 	public ArangoDBException(final Throwable cause) {
 		super(cause);
 	}
@@ -54,7 +60,7 @@ public String getException() {
 	}
 
 	public Integer getResponseCode() {
-		return entity != null ? entity.getCode() : null;
+		return responseCode != null ? responseCode : entity != null ? entity.getCode() : null;
 	}
 
 	public Integer getErrorNum() {

src/main/java/com/arangodb/internal/http/HttpCommunication.java

@@ -381,7 +381,8 @@ protected void checkError(final Response response) throws ArangoDBException {
 					final ErrorEntity errorEntity = util.deserialize(response.getBody(), ErrorEntity.class);
 					throw new ArangoDBException(errorEntity);
 				} else {
-					throw new ArangoDBException(String.format("Response Code: %s", response.getResponseCode()));
+					throw new ArangoDBException(String.format("Response Code: %s", response.getResponseCode()),
+							response.getResponseCode());
 				}
 			}
 		} catch (final VPackParserException e) {

src/main/java/com/arangodb/internal/velocystream/VstCommunication.java

@@ -105,7 +105,8 @@ protected void checkError(final Response response) throws ArangoDBException {
 					final ErrorEntity errorEntity = util.deserialize(response.getBody(), ErrorEntity.class);
 					throw new ArangoDBException(errorEntity);
 				} else {
-					throw new ArangoDBException(String.format("Response Code: %s", response.getResponseCode()));
+					throw new ArangoDBException(String.format("Response Code: %s", response.getResponseCode()),
+							response.getResponseCode());
 				}
 			}
 		} catch (final VPackParserException e) {