diff --git a/src/if_py_both.h b/src/if_py_both.h
index bdac3fc..d816386 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -19,7 +19,8 @@
 typedef int Py_ssize_t;  // Python 2.4 and earlier don't have this type.
 #endif
 
-#define ENC_OPT (enc_utf8 ? "utf-8" : (char *)p_enc)
+// Use values that are known to work, others may make Vim crash.
+#define ENC_OPT (enc_utf8 ? "utf-8" : enc_dbcs ? "euc-jp" : (char *)p_enc)
 #define DOPY_FUNC "_vim_pydo"
 
 static const char *vim_special_path = "_vim_path_";
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 397299e..97f797e 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -172,5 +172,9 @@
   " this crashed Vim once
   set encoding=utf32
   py3 print('hello')
+  set encoding=debug
+  py3 print('hello')
+  set encoding=euc-tw
+  py3 print('hello')
   set encoding=utf8
 endfunc
diff --git a/src/version.c b/src/version.c
index e09006d..58211bc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    70,
+/**/
     69,
 /**/
     68,