diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
index cb84917e..5e5b53a7 100644
--- a/api/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -29,7 +29,12 @@ public class Util
             uri = new URI( "tcp://" + hostline );
         } catch ( URISyntaxException ex )
         {
-            throw new IllegalArgumentException( "Bad hostline", ex );
+            throw new IllegalArgumentException( "Bad hostline: " + hostline, ex );
+        }
+
+        if ( uri.getHost() == null )
+        {
+            throw new IllegalArgumentException( "Invalid host/address: " + hostline );
         }
 
         return new InetSocketAddress( uri.getHost(), ( uri.getPort() ) == -1 ? DEFAULT_PORT : uri.getPort() );