Index: src/gui_w32.c
===================================================================
--- src/gui_w32.c	(revision 218)
+++ src/gui_w32.c	(working copy)
@@ -1136,15 +1136,6 @@
     }
 }
 
-#ifndef FEAT_OLE
-    static void
-ole_error(char *arg)
-{
-    EMSG2(_("E243: Argument not supported: \"-%s\"; Use the OLE version."),
-									 arg);
-}
-#endif
-
 /*
  * Parse the GUI related command-line arguments.  Any arguments used are
  * deleted from argv, and *argc is decremented accordingly.  This is called
@@ -1177,7 +1168,7 @@
 	    mch_exit(0);
 #else
 	    if (!silent)
-		ole_error("register");
+		mch_errmsg(_("E243: Argument not supported: \"-register\"; Use the OLE version.")),
 	    mch_exit(2);
 #endif
 	}
@@ -1190,7 +1181,7 @@
 	    mch_exit(0);
 #else
 	    if (!silent)
-		ole_error("unregister");
+		mch_errmsg(_("E243: Argument not supported: \"-unregister\"; Use the OLE version.")),
 	    mch_exit(2);
 #endif
 	}
@@ -1205,7 +1196,7 @@
 #ifdef FEAT_OLE
 	    *argc = 1;
 #else
-	    ole_error("embedding");
+ 	    mch_errmsg(_("E243: Argument not supported: \"-embedding\"; Use the OLE version.")),
 	    mch_exit(2);
 #endif
 	}
Index: src/misc2.c
===================================================================
--- src/misc2.c	(revision 218)
+++ src/misc2.c	(working copy)
@@ -1713,6 +1713,8 @@
     int		b;
 
     p = string;
+    if (p == NULL)
+        return NULL;
 #ifdef FEAT_MBYTE
     if (enc_utf8 && c >= 0x80)
     {