---
 src/emacs-module.c |    1 +
 src/xmenu.c        |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- src/xmenu.c
+++ src/xmenu.c	2016-09-19 09:01:56.930605125 +0000
@@ -1922,8 +1922,8 @@ Lisp_Object
 xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
 {
   Lisp_Object title;
-  const char *error_name;
-  Lisp_Object selection;
+  const char *error_name = NULL;
+  Lisp_Object selection = Qnil;
   ptrdiff_t specpdl_count = SPECPDL_INDEX ();
 
   check_window_system (f);
--- src/emacs-module.c
+++ src/emacs-module.c	2016-09-20 09:36:52.881778063 +0000
@@ -787,6 +787,7 @@ usage: (module-call ENVOBJ &rest ARGLIST
     default:
       eassume (false);
     }
+  return Qnil;
 }