Index: src/main/java/org/apache/jackrabbit/core/SessionImpl.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/SessionImpl.java	(revision 418741)
+++ src/main/java/org/apache/jackrabbit/core/SessionImpl.java	(working copy)
@@ -753,7 +753,12 @@
      * {@inheritDoc}
      */
     public Node getNodeByUUID(String uuid) throws ItemNotFoundException, RepositoryException {
-        return getNodeByUUID(UUID.fromString(uuid));
+        try {
+            return getNodeByUUID(UUID.fromString(uuid));
+        } catch (IllegalArgumentException e) {
+            // Assuming the exception is from UUID.fromString()
+            throw new RepositoryException("Invalid UUID: " + uuid, e);
+        }
     }
 
     /**