Index: env/jpf/java/lang/Class.java
===================================================================
--- env/jpf/java/lang/Class.java	(revision 1906)
+++ env/jpf/java/lang/Class.java	(working copy)
@@ -210,7 +210,7 @@
                                       IllegalAccessException;
 
   public String toString () {
-    return ("class " + name);
+    return (isInterface() ? "interface " : "class") + name;
   }
 
   @SuppressWarnings("unchecked")
Index: env/jvm/gov/nasa/jpf/jvm/JPF_java_lang_Class.java
===================================================================
--- env/jvm/gov/nasa/jpf/jvm/JPF_java_lang_Class.java	(revision 1906)
+++ env/jvm/gov/nasa/jpf/jvm/JPF_java_lang_Class.java	(working copy)
@@ -471,7 +471,7 @@
     }
     
     if (fi == null) {      
-      env.throwException("java.lang.NoSuchFieldException", ci.getName() + '.' + fname);
+      env.throwException("java.lang.NoSuchFieldException", fname);
       return MJIEnv.NULL;
       
     } else {