diff --git a/src/os_mswin.c b/src/os_mswin.c
index 485ee20..c473460 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -2307,16 +2307,20 @@
     void
 serverSetName(char_u *name)
 {
+    size_t	namelen;
     char_u	*ok_name;
     HWND	hwnd = 0;
     int		i = 0;
     char_u	*p;
 
     // Leave enough space for a 9-digit suffix to ensure uniqueness!
-    ok_name = alloc(STRLEN(name) + 10);
+    namelen = STRLEN(name);
+    ok_name = alloc(namelen + 10);
+    if (ok_name == NULL)
+	return;
 
     STRCPY(ok_name, name);
-    p = ok_name + STRLEN(name);
+    p = ok_name + namelen;
 
     for (;;)
     {
diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro
index 055cf8c..e8e08d2 100644
--- a/src/proto/os_mswin.pro
+++ b/src/proto/os_mswin.pro
@@ -1,4 +1,5 @@
 /* os_mswin.c */
+void SaveInst(HINSTANCE hInst);
 void mch_exit_g(int r);
 void mch_early_init(void);
 int mch_input_isatty(void);
diff --git a/src/version.c b/src/version.c
index 9a19260..abd0fa3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1316,
+/**/
     1315,
 /**/
     1314,