--- a/src/help.cc
+++ b/src/help.cc
@@ -66,6 +66,7 @@
 #include "symtab.h"
 #include "syswait.h"
 #include "toplev.h"
+#include "unwind-prot.h"
 #include "utils.h"
 #include "variables.h"
 #include "version.h"
@@ -652,8 +653,14 @@
 {
   bool retval = false;
 
+  // FIXME -- this is a bit of a kluge...
+  unwind_protect_bool (reading_script_file);
+  reading_script_file = true;
+
   h = get_help_from_file (nm, symbol_found, file);
 
+  unwind_protect::run ();
+
   if (h.length () > 0)
     retval = true;
 
@@ -816,6 +823,12 @@
 	      ? std::string ("script") : std::string ("function");
 	}
     }
+  else
+    {
+      // We might find a file that contains only a doc string.
+
+      file = load_path::find_fcn_file (name);
+    }
 
   return file;
 }