diff --git a/AUTHORS b/AUTHORS
index 904cde557..68d10b076 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Bart De Vries <devriesb@gmail.com>
 Ben Curthoys <ben@bencurthoys.com>
 Ben Schulz <ueomkail@gmail.com> <uok@users.noreply.github.com>
 Ben Sidhom <bsidhom@gmail.com>
+Benny Ng <benny.tpng@gmail.com>
 Brandon Philips <brandon@ifup.org>
 Brendan Long <self@brendanlong.com>
 Brian R. Becker <brbecker@gmail.com>
diff --git a/NICKS b/NICKS
index 91354a5d8..06d73946d 100644
--- a/NICKS
+++ b/NICKS
@@ -72,6 +72,7 @@ Stefan-Code	<stefan.github@gmail.com> <Stefan.github@gmail.com>
 timabell	<tim@timwise.co.uk>
 tnn2		<tnn@nygren.pp.se>
 tojrobinson	<tully@tojr.org>
+tpng		<benny.tpng@gmail.com>
 tylerbrazier	<tyler@tylerbrazier.com>
 uok		<ueomkail@gmail.com> <uok@users.noreply.github.com>
 veeti		<veeti.paananen@rojekti.fi>
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index eabd4c37a..28fc7aa6d 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -1531,6 +1531,9 @@ angular.module('syncthing.core')
             if (key.substr(0, 1) === '_') {
                 return 'skip';
             }
+            if (value === null) {
+                return 'null';
+            }
             if (typeof value === 'number') {
                 return 'number';
             }