diff --git a/src/if_py_both.h b/src/if_py_both.h
index aa25912..cbfbaa7 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -77,6 +77,11 @@
     if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))
 	return NULL;
 
+    /* TODO: This works around a gcc optimizer problem and avoids Vim
+     * from crashing.  Should find a real solution. */
+    if (str == NULL)
+	return NULL;
+
     Py_BEGIN_ALLOW_THREADS
     Python_Lock_Vim();
     writer((writefn)(error ? emsg : msg), (char_u *)str, len);
diff --git a/src/version.c b/src/version.c
index c0d60e8..b2f26a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    497,
+/**/
     496,
 /**/
     495,