diff --git a/pom.xml b/pom.xml
index a177789e3add..d43786697f05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,6 +329,10 @@
 			<id>dangerousben</id>
 			<name>Ben Spencer</name>
 		</developer>
+		<developer>
+			<id>maclema</id>
+			<name>maclema</name>
+		</developer>
 	</developers>
 
 	<licenses>
@@ -351,7 +355,7 @@
 		<!-- Dependency Versions -->
 		<derby_version>10.13.1.1</derby_version>
 		<jersey_version>2.25.1</jersey_version>
-		<jetty_version>9.4.3.v20170317</jetty_version>
+		<jetty_version>9.4.5.v20170502</jetty_version>
 		<hibernate_version>5.2.9.Final</hibernate_version>
 		<hibernate_validator_version>5.4.1.Final</hibernate_validator_version>
 		<!-- Update lucene version when you update hibernate-search version -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 63179d7bab2f..ca730fa30337 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -149,6 +149,11 @@
 			<action type="fix">
 				Validator incorrectly rejected references where only an identifier was populated
 			</action>
+			<action type="fix" issue="649">
+				Make error handler in the client more tolerant of errors where no response has
+				been received by the client when the error happens. Thanks to GitHub
+				user maclema for the pull request!
+			</action>
 		</release>
 		<release version="2.4" date="2017-04-19">
 			<action type="add">