diff --git a/src/core/org/luaj/vm/CallInfo.java b/src/core/org/luaj/vm/CallInfo.java
index 99194f91..bbf2d8bf 100644
--- a/src/core/org/luaj/vm/CallInfo.java
+++ b/src/core/org/luaj/vm/CallInfo.java
@@ -54,8 +54,4 @@ public class CallInfo {
 		return -1;
 	}
 
-	public String sourcename() {
-        return LoadState.getSourceName(closure.p.source.toJavaString());
-	}
-
 }
diff --git a/src/core/org/luaj/vm/LPrototype.java b/src/core/org/luaj/vm/LPrototype.java
index 0c27e14f..67eef1e7 100644
--- a/src/core/org/luaj/vm/LPrototype.java
+++ b/src/core/org/luaj/vm/LPrototype.java
@@ -69,5 +69,9 @@ public class LPrototype {
 	  }
 	  return null;  /* not found */
 	}
+
+	public String sourceshort() {
+        return LoadState.getSourceName(source.toJavaString());
+	}
 	
 }
diff --git a/src/core/org/luaj/vm/LuaState.java b/src/core/org/luaj/vm/LuaState.java
index cb229253..a4b2e8f7 100644
--- a/src/core/org/luaj/vm/LuaState.java
+++ b/src/core/org/luaj/vm/LuaState.java
@@ -1097,7 +1097,7 @@ public class LuaState extends Lua {
 						}
 					}
 					if ( (level--) <= 0 ) {
-						return ci.sourcename()+":"+ci.currentline();
+						return ci.closure.p.sourceshort()+":"+ci.currentline();
 					}
 				}
 			}