diff --git a/src/core/org/luaj/lib/BaseLib.java b/src/core/org/luaj/lib/BaseLib.java
index 6b735a03..32239082 100644
--- a/src/core/org/luaj/lib/BaseLib.java
+++ b/src/core/org/luaj/lib/BaseLib.java
@@ -234,7 +234,7 @@ public class BaseLib extends LFunction {
 			}
 		}
 		case ERROR: {
-			vm.error(vm.optstring(1,null), vm.optint(2,1));
+			vm.error(vm.optstring(1,null), vm.optint(2,-1));
 			return 0;
 		}
 		case ASSERT: {
diff --git a/src/core/org/luaj/lib/DebugLib.java b/src/core/org/luaj/lib/DebugLib.java
index 13de74ef..ee4f2a3a 100644
--- a/src/core/org/luaj/lib/DebugLib.java
+++ b/src/core/org/luaj/lib/DebugLib.java
@@ -234,9 +234,12 @@ public class DebugLib extends LFunction {
 						info.put("linedefined", p.linedefined);
 						info.put("lastlinedefined", p.lastlinedefined);
 					} else {
+						LString name = (si.func!=null? 
+								new LString("[Java] "+si.func.toString()):
+								JAVASRC);
 						info.put("what", JAVA);
-						info.put("source", JAVASRC);
-						info.put("short_src", JAVASRC);
+						info.put("source", name);
+						info.put("short_src", name);
 						info.put("linedefined", -1);
 						info.put("lastlinedefined", -1);
 					}