diff --git a/src/main/java/ch/unisg/ics/interactions/wot/td/clients/UriTemplate.java b/src/main/java/ch/unisg/ics/interactions/wot/td/clients/UriTemplate.java
index d6a8eeb..68815d6 100644
--- a/src/main/java/ch/unisg/ics/interactions/wot/td/clients/UriTemplate.java
+++ b/src/main/java/ch/unisg/ics/interactions/wot/td/clients/UriTemplate.java
@@ -2,9 +2,10 @@
 
 import ch.unisg.ics.interactions.wot.td.schemas.DataSchema;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
+import java.nio.charset.StandardCharsets;
+
 
 public class UriTemplate {
 
@@ -16,11 +17,7 @@ public UriTemplate(String expression) {
   }
 
   static List<String> extract(String path) {
-    try {
-      path = URLDecoder.decode(path, "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
+    path = URLDecoder.decode(path, StandardCharsets.UTF_8);
     List<String> extracted = new ArrayList<>();
     int n = path.length();
     String s = "";