diff --git a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java
index 1c22ac98..d93ca13b 100644
--- a/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java
+++ b/custom-checks/checkstyle/src/main/java/org/openhab/tools/analysis/checkstyle/OhInfXmlValidationCheck.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -167,9 +168,9 @@ private void addToOhFiles(File xmlFile) {
 
     private Schema getXSD(String schemaUrlString, CachingHttpClient<Schema> client) {
         try {
-            URL schemaUrl = new URL(schemaUrlString);
+            URL schemaUrl = URI.create(schemaUrlString).toURL();
             return client.get(schemaUrl);
-        } catch (IOException e) {
+        } catch (IOException | IllegalArgumentException e) {
             logger.error("Unable to get XSD file {} : {}", schemaUrlString, e.getMessage(), e);
             return null;
         }