diff --git a/NativeLibs/yasio/yasio/bindings/yasio_ni.cpp b/NativeLibs/yasio/yasio/bindings/yasio_ni.cpp
index e30f3eb..50b1bab 100644
--- a/NativeLibs/yasio/yasio/bindings/yasio_ni.cpp
+++ b/NativeLibs/yasio/yasio/bindings/yasio_ni.cpp
@@ -157,8 +157,12 @@ YASIO_NI_API void yasio_set_option(void* service_ptr, int opt, const char* pszAr
   std::array<cxx17::string_view, YASIO_MAX_OPTION_ARGC> args;
   int argc = 0;
   yasio::split_if(&strArgs.front(), ';', [&](char* s, char* e) {
-    *e           = '\0'; // to c style string
-    args[argc++] = cxx17::string_view(s, e - s);
+    if (e) {
+        *e           = '\0'; // to c style string
+        args[argc++] = cxx17::string_view(s, e - s);
+    } else {
+        args[argc++] = cxx17::string_view{s};
+    }
     return (argc < YASIO_MAX_OPTION_ARGC);
   });