diff -ur netsurf-3.2/utils/nsoption.c netsurf-3.2.patched/utils/nsoption.c
--- netsurf-3.2/utils/nsoption.c	2014-08-26 18:57:21.000000000 +0400
+++ netsurf-3.2.patched/utils/nsoption.c	2015-03-22 23:48:53.000000000 +0300
@@ -231,7 +231,8 @@
 		 */
 		if (((defs[entry].value.s == NULL) &&
 		     (opts[entry].value.s != NULL)) ||
-		    ((defs[entry].value.s != opts[entry].value.s) &&
+		    ((opts[entry].value.s != NULL) &&
+                     (defs[entry].value.s != opts[entry].value.s) &&
 		     (strcmp(opts[entry].value.s, defs[entry].value.s) != 0))) {
 			ret = true;
 		}
@@ -255,7 +256,7 @@
 		struct nsoption_s *defs,
 		bool all)
 {
-	unsigned int entry; /* index to option being output */
+	enum nsoption_e entry; /* index to option being output */
 	colour rgbcolour; /* RRGGBB */
 
 	for (entry = 0; entry < NSOPTION_LISTEND; entry++) {