--- a/core/src/luan/modules/JavaLuan.java	Mon Jul 13 12:31:53 2015 -0600
+++ b/core/src/luan/modules/JavaLuan.java	Mon Jul 13 18:34:31 2015 -0600
@@ -49,8 +49,7 @@
 
 	static final Object FAIL = new Object();
 
-	public static Object __index(LuanBit bit,Object obj,Object key,boolean canReturnFail) throws LuanException {
-		LuanState luan = bit.luan;
+	public static Object __index(LuanState luan,Object obj,Object key,boolean canReturnFail) throws LuanException {
 		checkJava(luan);
 		Class cls;
 		if( obj instanceof Static ) {
@@ -112,10 +111,7 @@
 //System.out.println("invalid member '"+key+"' for java object: "+obj);
 		if( canReturnFail )
 			return FAIL;
-		if( bit.el != null )
-			throw bit.exception( "invalid index for java "+cls+" in '"+bit.el.text()+"'" );
-		else
-			throw bit.exception( "invalid index for java "+cls );
+		throw luan.exception( "invalid index for java "+cls+" in '"+luan.context()+"'" );
 	}
 
 	private static Object member(Object obj,List<Member> members) throws LuanException {
@@ -331,7 +327,7 @@
 						if( args==null )
 							args = new Object[0];
 						String name = method.getName();
-						Object fnObj = t.get(luan.JAVA,name);
+						Object fnObj = t.get(luan,name);
 						if( fnObj == null )
 							throw new NullPointerException("luan_proxy couldn't find method '"+name+"'");
 						LuanFunction fn = luan.checkFunction(fnObj);