diff --git a/pom.xml b/pom.xml
index 3bad57ed..f1fe7b0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>5.0.1.RELEASE</spring.version>
+		<spring.version>5.0.6.RELEASE</spring.version>
 		<logback.version>1.2.3</logback.version>
 		<jacoco>0.7.9</jacoco>
 		<jacoco.destfile>${project.build.directory}/jacoco.exec</jacoco.destfile>
@@ -86,7 +86,7 @@
 		<profile>
 			<id>spring5-next</id>
 			<properties>
-				<spring.version>5.0.2.BUILD-SNAPSHOT</spring.version>
+				<spring.version>5.0.7.BUILD-SNAPSHOT</spring.version>
 				<jackson.version>2.9.2</jackson.version>
 			</properties>
 			<repositories>
diff --git a/src/main/java/org/springframework/hateoas/core/EncodingUtils.java b/src/main/java/org/springframework/hateoas/core/EncodingUtils.java
index 953f584d..a2428b9f 100644
--- a/src/main/java/org/springframework/hateoas/core/EncodingUtils.java
+++ b/src/main/java/org/springframework/hateoas/core/EncodingUtils.java
@@ -17,8 +17,6 @@ package org.springframework.hateoas.core;
 
 import lombok.experimental.UtilityClass;
 
-import java.io.UnsupportedEncodingException;
-
 import org.springframework.util.Assert;
 import org.springframework.web.util.UriUtils;
 
@@ -26,6 +24,7 @@ import org.springframework.web.util.UriUtils;
  * Utilities for URI encoding.
  * 
  * @author Oliver Gierke
+ * @author Greg Turnquist
  * @since 0.22
  * @soundtrack Don Philippe - Between Now And Now (Between Now And Now)
  */
@@ -46,8 +45,8 @@ public class EncodingUtils {
 
 		try {
 			return UriUtils.encodePath(source.toString(), ENCODING);
-		} catch (UnsupportedEncodingException o_O) {
-			throw new IllegalStateException(o_O);
+		} catch (Throwable e) {
+			throw new RuntimeException(e);
 		}
 	}
 
@@ -63,8 +62,8 @@ public class EncodingUtils {
 
 		try {
 			return UriUtils.encodeQueryParam(source.toString(), ENCODING);
-		} catch (UnsupportedEncodingException o_O) {
-			throw new IllegalStateException(o_O);
+		} catch (Throwable e) {
+			throw new RuntimeException(e);
 		}
 	}
 
@@ -80,8 +79,8 @@ public class EncodingUtils {
 
 		try {
 			return UriUtils.encodeFragment(source.toString(), ENCODING);
-		} catch (UnsupportedEncodingException o_O) {
-			throw new IllegalStateException(o_O);
+		} catch (Throwable e) {
+			throw new RuntimeException(e);
 		}
 	}
 }