--- a/src/toplev.h
+++ b/src/toplev.h
@@ -157,7 +157,7 @@
   // Caller function, may be built-in.
   static octave_function *caller (void)
   {
-    return element (1);
+    return instance_ok () ? instance->do_caller () : 0;
   }
 
   static size_t current_frame (void)
@@ -286,6 +286,11 @@
 
   int do_caller_user_code_column (void) const;
 
+  octave_function *do_caller (void) const
+  {
+    return curr_frame > 1 ? cs[curr_frame-1].fcn : cs[0].fcn;
+  }
+
   size_t do_current_frame (void) { return curr_frame; }
 
   size_t do_size (void) { return cs.size (); }