diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index f9e73aed8a..fc5860b69c 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -171,6 +171,10 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
+  if (!(save_ptr && *save_ptr)) {
+    return (wxChar *) NULL;
+  }
+
   if (!psz) psz = *save_ptr;
   psz += wxStrspn(psz, delim);
   if (!*psz) {