diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
index 4bd7d65..072bade 100644
--- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
+++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
@@ -153,6 +153,12 @@
                     throw newNamingException(iae);
                 }
             }
+            int fmark = url.indexOf('#', i);
+            if (fmark > -1) {
+                if (!acceptsFragment()) {
+                    throw newNamingException(new IllegalArgumentException("URI fragments not supported: " + url));
+                }
+            }
 
             if ("".equals(host)) {
                 host = null;
@@ -286,12 +292,12 @@
         }
 
         NamingException newNamingException(Throwable cause) {
-            NamingException ne = new NamingException(cause.getMessage());
+            NamingException ne = new InvalidNameException(cause.getMessage());
             ne.initCause(cause);
             return ne;
         }
 
-        boolean acceptsFragment() {
+        protected boolean acceptsFragment() {
             return true;
         }
     }