2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fdc292..58ce528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-17  Paul Smith  <psmith@gnu.org>
+
+	* guile.c (func_guile): Handle NULL returns from Guile.
+
 2012-01-16  Paul Smith  <psmith@gnu.org>
 
 	* make.h (PATH_SEPARATOR_CHAR): Allow resetting for crosscompiling
diff --git a/guile.c b/guile.c
index c32821a..2a35e8b 100644
--- a/guile.c
+++ b/guile.c
@@ -92,8 +92,11 @@ func_guile (char *o, char **argv, const char *funcname UNUSED)
   if (argv[0] && argv[0][0] != '\0')
     {
       char *str = scm_with_guile (internal_guile_eval, argv[0]);
-      o = variable_buffer_output (o, str, strlen (str));
-      free (str);
+      if (str)
+        {
+          o = variable_buffer_output (o, str, strlen (str));
+          free (str);
+        }
     }
 
   return o;