- Improved exceptions launched on errors

1 files changed, 4 insertions, 3 deletions

diff --git a/sources/scala/tools/scalai/PathClassLoader.java b/sources/scala/tools/scalai/PathClassLoader.java
index 251b79661f..34aec40a59 100644
--- a/sources/scala/tools/scalai/PathClassLoader.java
+++ b/sources/scala/tools/scalai/PathClassLoader.java
@@ -32,13 +32,14 @@ public class PathClassLoader extends ClassLoader {
     // ClassLoader interface
 
     public Class findClass(String name) throws ClassNotFoundException {
+        String filename = name.replace('.', File.separatorChar) + ".class";
+        AbstractFile file = root.lookupPath(filename, false);
+        if (file == null) throw new ClassNotFoundException(name);
         try {
-            String filename = name.replace('.', File.separatorChar) + ".class";
-            AbstractFile file = root.lookupPath(filename, false);
             byte[] bytes = file.read();
             return defineClass(name, bytes, 0, bytes.length);
         } catch (IOException exception) {
-            throw new ClassNotFoundException(name);
+            throw new ClassFormatError(name+"(Failed to read file "+file+")");
         }
     }