diff --git a/HISTORY.md b/HISTORY.md
index 9eb8949d7..9b3a1cfe5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,11 @@
 # History
 
 
+## not yet released, version 3.16.4
+
+- Fixed many small issues in the embedded docs.  Thanks @Schnark.
+
+
 ## 2017-08-28, version 3.16.3
 
 - Fixed #934: Wrong simplification of unary minus. Thanks @firepick1.
diff --git a/lib/expression/Help.js b/lib/expression/Help.js
index 68f33c771..909f2cb9b 100644
--- a/lib/expression/Help.js
+++ b/lib/expression/Help.js
@@ -62,12 +62,13 @@ function factory (type, config, load, typed) {
 
         var res;
         try {
+          // note: res can be undefined when `expr` is an empty string
           res = parser.eval(expr);
         }
         catch (e) {
           res = e;
         }
-        if (!type.isHelp(res)) {
+        if (res !== undefined && !type.isHelp(res)) {
           desc += '        ' + string.format(res, {precision: 14}) + '\n';
         }
       }
diff --git a/package.json b/package.json
index e7ba4a857..40f8b7c75 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "Mathias Polligkeit (https://github.com/woylie)",
     "Max Bruckner (https://github.com/FSMaxB)",
     "Maxence Dalmais (https://github.com/maxired)",
+    "Michael M. (https://github.com/Schnark)",
     "Mitchel Kelonye (https://github.com/kelonye)",
     "mtraynham (https://github.com/mtraynham)",
     "Niels Heisterkamp (https://github.com/nheisterkamp)",