diff --git a/.binding.gyp.un~ b/.binding.gyp.un~
deleted file mode 100644
index 589d3096..00000000
Binary files a/.binding.gyp.un~ and /dev/null differ
diff --git a/.package.json.un~ b/.package.json.un~
deleted file mode 100644
index 96f905f2..00000000
Binary files a/.package.json.un~ and /dev/null differ
diff --git a/.vscode/launch.json b/.vscode/launch.json
index c1cdb7ea..4e511dc5 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -25,8 +25,9 @@
             "request": "launch",
             "program": "C:/Program Files/nodejs/node.exe",
             "args": [
-                "./node_modules/mocha/bin/mocha.js",
-               "test/sproc"
+                "samples/javascript/streaming.js"
+               // "./node_modules/mocha/bin/mocha.js",
+               // "test/sproc"
                // "test/table-builder"
                // "simple-demo"
                // "runtest", "-k", "linux", 
@@ -41,7 +42,7 @@
                // "-t", "multiple-errors", 
                // "-t", "geography",
                // "-t", "tvp",
-               // "-t", "warnings",
+               //"-t", "warnings",
                // "-t", "txn",
                // "-t", "datatypes",
                // "-t", "sproc"
@@ -62,10 +63,10 @@
             "name": "(gdb) Launch",
             "type": "cppdbg",
             "request": "launch",
-            "program": "/home/stephen/.nvm/versions/node/v15.12.0/bin/node",
+            "program": "C:/ProgramData/nvm/v22.5.1/node",
             "args": [
-                "runtest", "-k", "wsl",
-                "-t", "prepared", 
+                "samples/javascript/streaming.js",
+                // "-t", "prepared", 
                 // "-t", "warnings", 
                 // "-t", "bulk", 
                 // "-t", "querycancel",
diff --git a/appveyor.yml b/appveyor.yml
index 260ae8d2..1eb837d0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,8 @@ platform:
 
 environment:
   matrix:
+    - nodejs_version: 22
     - nodejs_version: 20
-    - nodejs_version: 18
 
 test_script:
   - ps: Write-Host "msnodesqlv8 test script"
diff --git a/binding.gyp b/binding.gyp
index 7b5dcdc0..11b575e9 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -1,190 +1,192 @@
 {
-      'conditions': [
-            [
-              'OS=="mac"', {
-                'variables': {
-                    'arch%': '<!(uname -m)',
-                    "cflags_cpp" : "gnu++20",
+    "conditions": [
+        [
+            'OS=="mac"',
+            {
+                "variables": {
+                    "arch%": "<!(uname -m)",
+                    "cflags_cpp": "gnu++20",
                 }
-              },
-              'OS=="linux"', {
-                'variables': {
-                  "cflags_cpp" : "-std=c++20",
-                  'arch%': '<!(uname -m)',
+            },
+            'OS=="linux"',
+            {
+                "variables": {
+                    "cflags_cpp": "-std=c++20",
+                    "arch%": "<!(uname -m)",
                 }
-              },
-              'OS=="win"', {
-                'variables': {
-                  "cflags_cpp" : "std:c++20",
-                  'arch%': '<!(echo %PROCESSOR_ARCHITECTURE%)'
+            },
+            'OS=="win"',
+            {
+                "variables": {
+                    "cflags_cpp": "/std:c++20",
+                    "arch%": "<!(echo %PROCESSOR_ARCHITECTURE%)",
+                },
+            },
+        ]
+    ],
+    "variables": {
+        "openssl_fips": "0",
+        # look for include files for these versions - taking top first priority
+        "msodbsver%": ["msodbcsql18", "msodbcsql17"],
+        "ext%": ".cpp",
+        "homebrew%": "/opt/homebrew/lib/libodbc.a",
+        "unixlocalodbc%": "-l/usr/local/odbc",
+        "linuxodbc%": "-lodbc",
+        "winodbc%": "odbc32",
+        # pick up libodbc from somwhere - note the ms driver is loaded
+        # dynamicaly via odbc, no
+        # link dependency is added
+        "linkdir%": "/usr/local/lib /usr/local/ssl/lib64/ /opt/homebrew/lib /home/linuxbrew/.linuxbrew/lib/ /usr/lib /usr/lib64 .",
+    },
+    "targets": [
+        {
+            # seems this is only way to add the cpp version flag
+            # on ms compiler - now needed for electron
+            "msvs_settings": {
+                "VCCLCompilerTool": {
+                    "ExceptionHandling": 1,
+                    "AdditionalOptions": ["/std:c++20"],
                 }
-              }
-            ]
-        ],
-        'variables': {
-          'openssl_fips' : '0',
-          # look for include files for these versions - taking top first priority
-          'msodbsver%': [
-            'msodbcsql18',
-            'msodbcsql17'
-          ],
-          'ext%': '.cpp',
-          'homebrew%': '/opt/homebrew/lib/libodbc.a',
-          'unixlocalodbc%': '-l/usr/local/odbc',
-          'linuxodbc%': '-lodbc',
-          'winodbc%': 'odbc32',
-          # pick up libodbc from somwhere - note the ms driver is loaded dynamicaly via odbc, no 
-          # link dependency is added
-          'linkdir%': '/usr/local/lib /usr/local/ssl/lib64/ /opt/homebrew/lib /home/linuxbrew/.linuxbrew/lib/ /usr/lib /usr/lib64 .'
-        },
-
-  'targets': [
-    {
-      'target_name': 'sqlserverv8',
-
-      'variables': {
-      # Set the target variable only if it is not passed in by prebuild 
-        'target%': '<!(node -e "console.log(process.versions.node)")', 
-      # which folders are available for include eg. 
-      # /opt/microsoft/msodbcsql18/include/ /opt/microsoft/msodbcsql17/include/ 
-     'msodbc_include_folders%': [
-          "<!@(node -p \""
-              "'<(msodbsver)'"
-              ".split(' ')"
-              ".map(x => ["
-                "'/opt/microsoft/' + x +'/include/'"
-                " ,"
-                "'/usr/local/opt/' + x + '/include/'"
-                 " ,"
-                "'/usr/local/opt/' + x + '/include/' + x + '/'"
-                " ,"
-                "'/opt/homebrew/include/' + x + '/'"
-                " ,"
-                "'/home/linuxbrew/.linuxbrew/include/'"
-                "])"
-              ".flatMap(y => y)"
-              ".filter(z => require('fs').existsSync(z))"
-              ".join(' ')"
-            "\")"
-        ],       
-        # set fo
-        # the link folders available -L/usr/local/lib -L/usr/lib -L. 
-        'link_path%': [
-          "<!@(node -p \""
-              "'<(linkdir)'"
-              ".split(' ')"
-              ".filter(x => require('fs')"
-              ".existsSync(x))"
-              ".map(x => '-L'+ x)"
-              ".join(' ')"
-              "\")"
-          ], # set for macos based on silicon
-
-        # enumerate the cpp src files rather than name them.
-        'fileset%': [
-          "<!@(node -p \""
-            "require('fs')"
-            ".readdirSync('./src')"
-            ".filter(x => x.endsWith('<(ext)'))"
-            ".map(f => 'src/'+f)"
-            ".join(' ')"
-            "\")"
-          ]
-      },
-
-      'sources' : [
-        "<!@(node -p \"'<(fileset)'"
-          ".split(' ')"
-          ".join(' ')\")"
-      ],
-
-      'include_dirs': [
-        "<!(node -e \"require('nan')\")",
-        'src',
-      ],
-
-     'defines': [ 'NODE_GYP_V4' ],
-      'actions': [
-          {
-            'action_name': 'print_variables',
-            'action': ['echo', 'cflags_cpp <(cflags_cpp) | arch: <(arch) | link_path: <(link_path) | msodbc_include_folders <(msodbc_include_folders) | fileset <(fileset)'],
-            'inputs': [],
-            'outputs': [
-              "<!@(node -p \"'<(fileset)'.split(' ')[0]\")"
-              ],
-            #'outputs': ['src/ConnectionHandles.cpp']
-          }
-      ],
-#
-# currently for electron v20+ manually set the package.json 
-# for node_modules/prebuild dependencies (else code will not
-# compile) - need to raise PR for prebuild
-# cat .\package.json | grep gyp
-#    "node-gyp": "^9.1.0",
-#    "nw-gyp": "^3.6.3",
-#
-# also patch nan with https://github.com/VerteDinde/nan/tree/deprecate_accessor_signature
-# whilst the PR is pending - this is only needed for electron v20 and
-# above
-#
-      'conditions': [
-            ['target < "13.0"', {
-                  'defines': [
-                    'PRE_V13',
-                  ],
-           }],
-   
-        [ 'OS=="win"', {
-              'link_settings': {
-             'libraries': [
-               '<(winodbc)'
-               ],
             },
-          'defines': [
-            'UNICODE=1',
-            'WINDOWS_BUILD',
-          ],
-          }
-        ],
-        ['OS=="linux"', {
-            'link_settings': {
-             'libraries': [
-                "<!@(node -p \"'<(link_path)'.split(' ').join(' ')\")",
-               '<(linuxodbc)',
-               ],
+            "target_name": "sqlserverv8",
+            "variables": {
+                # Set the target variable only if it is not passed in by prebuild
+                "target%": '<!(node -e "console.log(process.versions.node)")',
+                # which folders are available for include eg.
+                # /opt/microsoft/msodbcsql18/include/ /opt/microsoft/msodbcsql17/include/
+                "msodbc_include_folders%": [
+                    '<!@(node -p "'
+                    "'<(msodbsver)'"
+                    ".split(' ')"
+                    ".map(x => ["
+                    "'/opt/microsoft/' + x +'/include/'"
+                    " ,"
+                    "'/usr/local/opt/' + x + '/include/'"
+                    " ,"
+                    "'/usr/local/opt/' + x + '/include/' + x + '/'"
+                    " ,"
+                    "'/opt/homebrew/include/' + x + '/'"
+                    " ,"
+                    "'/home/linuxbrew/.linuxbrew/include/'"
+                    "])"
+                    ".flatMap(y => y)"
+                    ".filter(z => require('fs').existsSync(z))"
+                    ".join(' ')"
+                    '")'
+                ],
+                # set fo
+                # the link folders available -L/usr/local/lib -L/usr/lib -L.
+                "link_path%": [
+                    '<!@(node -p "'
+                    "'<(linkdir)'"
+                    ".split(' ')"
+                    ".filter(x => require('fs')"
+                    ".existsSync(x))"
+                    ".map(x => '-L'+ x)"
+                    ".join(' ')"
+                    '")'
+                ],  # set for macos based on silicon
+                # enumerate the cpp src files rather than name them.
+                "fileset%": [
+                    '<!@(node -p "'
+                    "require('fs')"
+                    ".readdirSync('./src')"
+                    ".filter(x => x.endsWith('<(ext)'))"
+                    ".map(f => 'src/'+f)"
+                    ".join(' ')"
+                    '")'
+                ],
             },
-            'defines': [
-              'LINUX_BUILD',
-              'UNICODE'
-            ],
-            'cflags_cc': ['<(cflags_cpp)'], 
-            'include_dirs': [
-               "<!@(node -p \"'<(msodbc_include_folders)'.split(' ').join(' ')\")",
-              '/usr/include/'
+            "sources": ["<!@(node -p \"'<(fileset)'" ".split(' ')" ".join(' ')\")"],
+            "include_dirs": [
+                "<!(node -e \"require('nan')\")",
+                "src",
             ],
-        }],
-        ['OS=="mac"', {
-            'link_settings': {
-             'libraries': [
-               '<(link_path)',
-               '<(linuxodbc)'
-             #'-lodbc'
-               ],
-            },
-            'defines': [
-              'LINUX_BUILD',
-              'UNICODE'
+            "defines": ["NODE_GYP_V4"],
+            "actions": [
+                {
+                    "action_name": "print_variables",
+                    "action": [
+                        "echo",
+                        "cflags_cpp <(cflags_cpp) | arch: <(arch) | link_path: <(link_path) | msodbc_include_folders <(msodbc_include_folders) | fileset <(fileset)",
+                    ],
+                    "inputs": [],
+                    "outputs": ["<!@(node -p \"'<(fileset)'.split(' ')[0]\")"],
+                    #'outputs': ['src/ConnectionHandles.cpp']
+                }
             ],
-            'xcode_settings': {
-              'CLANG_CXX_LANGUAGE_STANDARD': '<(cflags_cpp)'
-            },
-            'include_dirs': [
-              "<!@(node -p \"'<(msodbc_include_folders)'.split(' ').join(' ')\")",
-              '/opt/homebrew/include',
-              '/usr/local/include/',
+            #
+            # currently for electron v20+ manually set the package.json
+            # for node_modules/prebuild dependencies (else code will not
+            # compile) - need to raise PR for prebuild
+            # cat .\package.json | grep gyp
+            #    "node-gyp": "^9.1.0",
+            #    "nw-gyp": "^3.6.3",
+            #
+            # also patch nan with https://github.com/VerteDinde/nan/tree/deprecate_accessor_signature
+            # whilst the PR is pending - this is only needed for electron v20 and
+            # above
+            #
+            "conditions": [
+                [
+                    'target < "13.0"',
+                    {
+                        "defines": [
+                            "PRE_V13",
+                        ],
+                    },
+                ],
+                [
+                    'OS=="win"',
+                    {
+                        "link_settings": {
+                            "libraries": ["<(winodbc)"],
+                        },
+                        "defines": [
+                            "UNICODE=1",
+                            "WINDOWS_BUILD",
+                        ],
+                    },
+                ],
+                [
+                    'OS=="linux"',
+                    {
+                        "link_settings": {
+                            "libraries": [
+                                "<!@(node -p \"'<(link_path)'.split(' ').join(' ')\")",
+                                "<(linuxodbc)",
+                            ],
+                        },
+                        "defines": ["LINUX_BUILD", "UNICODE"],
+                        "cflags_cc": ["<(cflags_cpp)"],
+                        "include_dirs": [
+                            "<!@(node -p \"'<(msodbc_include_folders)'.split(' ').join(' ')\")",
+                            "/usr/include/",
+                        ],
+                    },
+                ],
+                [
+                    'OS=="mac"',
+                    {
+                        "link_settings": {
+                            "libraries": [
+                                "<(link_path)",
+                                "<(linuxodbc)",
+                                #'-lodbc'
+                            ],
+                        },
+                        "defines": ["LINUX_BUILD", "UNICODE"],
+                        "xcode_settings": {
+                            "CLANG_CXX_LANGUAGE_STANDARD": "<(cflags_cpp)"
+                        },
+                        "include_dirs": [
+                            "<!@(node -p \"'<(msodbc_include_folders)'.split(' ').join(' ')\")",
+                            "/opt/homebrew/include",
+                            "/usr/local/include/",
+                        ],
+                    },
+                ],
             ],
-        }],
-      ]
-    }
-  ]
+        }
+    ],
 }
diff --git a/binding.gyp~ b/binding.gyp~
deleted file mode 100644
index 788bb489..00000000
--- a/binding.gyp~
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-      'conditions': [
-            [
-              'OS=="mac"', {
-                'variables': {
-                    'arch%': '<!(uname -m)',
-                    "cflags_cpp" : "gnu++17",
-                }
-              },
-              'OS=="linux"', {
-                'variables': {
-                  "cflags_cpp" : "-std=c++17",
-                  'arch%': '<!(uname -m)',
-                }
-              },
-              'OS=="win"', {
-                'variables': {
-                  "cflags_cpp" : "/std:c++20",
-                  'arch%': '<!(echo %PROCESSOR_ARCHITECTURE%)'
-                }
-              }
-            ]
-        ],
-        'variables': {
-          'openssl_fips' : '0',
-          # look for include files for these versions - taking top first priority
-          'msodbsver%': [
-            'msodbcsql18',
-            'msodbcsql17'
-          ],
-          'ext%': '.cpp',
-          'homebrew%': '/opt/homebrew/lib/libodbc.a',
-          'unixlocalodbc%': '-l/usr/local/odbc',
-          'linuxodbc%': '-lodbc',
-          'winodbc%': 'odbc32',
-          # pick up libodbc from somwhere - note the ms driver is loaded dynamicaly via odbc, no 
-          # link dependency is added
-          'linkdir%': '/usr/local/lib /usr/local/ssl/lib64/ /opt/homebrew/lib /home/linuxbrew/.linuxbrew/lib/ /usr/lib /usr/lib64 .'
-        },
-
-  'targets': [
-    {
-      'target_name': 'sqlserverv8',
-
-      'variables': {
-      # Set the target variable only if it is not passed in by prebuild 
-        'target%': '<!(node -e "console.log(process.versions.node)")', 
-      # which folders are available for include eg. 
-      # /opt/microsoft/msodbcsql18/include/ /opt/microsoft/msodbcsql17/include/ 
-     'msodbc_include_folders%': [
-          "<!@(node -p \""
-              "'<(msodbsver)'"
-              ".split(' ')"
-              ".map(x => ["
-                "'/opt/microsoft/' + x +'/include/'"
-                " ,"
-                "'/usr/local/opt/' + x + '/include/'"
-                 " ,"
-                "'/usr/local/opt/' + x + '/include/' + x + '/'"
-                " ,"
-                "'/opt/homebrew/include/' + x + '/'"
-                " ,"
-                "'/home/linuxbrew/.linuxbrew/include/'"
-                "])"
-              ".flatMap(y => y)"
-              ".filter(z => require('fs').existsSync(z))"
-              ".join(' ')"
-            "\")"
-        ],       
-        # set fo
-        # the link folders available -L/usr/local/lib -L/usr/lib -L. 
-        'link_path%': [
-          "<!@(node -p \""
-              "'<(linkdir)'"
-              ".split(' ')"
-              ".filter(x => require('fs')"
-              ".existsSync(x))"
-              ".map(x => '-L'+ x)"
-              ".join(' ')"
-              "\")"
-          ], # set for macos based on silicon
-
-        # enumerate the cpp src files rather than name them.
-        'fileset%': [
-          "<!@(node -p \""
-            "require('fs')"
-            ".readdirSync('./src')"
-            ".filter(x => x.endsWith('<(ext)'))"
-            ".map(f => 'src/'+f)"
-            ".join(' ')"
-            "\")"
-          ]
-      },
-
-      'sources' : [
-        "<!@(node -p \"'<(fileset)'"
-          ".split(' ')"
-          ".join(' ')\")"
-      ],
-
-      'include_dirs': [
-        "<!(node -e \"require('nan')\")",
-        'src',
-      ],
-
-     'defines': [ 'NODE_GYP_V4' ],
-      'actions': [
-          {
-            'action_name': 'print_variables',
-            'action': ['echo', 'cflags_cpp <(cflags_cpp) | arch: <(arch) | link_path: <(link_path) | msodbc_include_folders <(msodbc_include_folders) | fileset <(fileset)'],
-            'inputs': [],
-            'outputs': [
-              "<!@(node -p \"'<(fileset)'.split(' ')[0]\")"
-              ],
-            #'outputs': ['src/ConnectionHandles.cpp']
-          }
-      ],
-#
-# currently for electron v20+ manually set the package.json 
-# for node_modules/prebuild dependencies (else code will not
-# compile) - need to raise PR for prebuild
-# cat .\package.json | grep gyp
-#    "node-gyp": "^9.1.0",
-#    "nw-gyp": "^3.6.3",
-#
-# also patch nan with https://github.com/VerteDinde/nan/tree/deprecate_accessor_signature
-# whilst the PR is pending - this is only needed for electron v20 and
-# above
-#
-      'conditions': [
-            ['target < "13.0"', {
-                  'defines': [
-                    'PRE_V13',
-                  ],
-           }],
-   
-        [ 'OS=="win"', {
-              'link_settings': {
-             'libraries': [
-               '<(winodbc)'
-               ],
-            },
-          'defines': [
-            'UNICODE=1',
-            'WINDOWS_BUILD',
-          ],
-          }
-        ],
-        ['OS=="linux"', {
-            'link_settings': {
-             'libraries': [
-                "<!@(node -p \"'<(link_path)'.split(' ').join(' ')\")",
-               '<(linuxodbc)',
-               ],
-            },
-            'defines': [
-              'LINUX_BUILD',
-              'UNICODE'
-            ],
-            'cflags_cc': ['<(cflags_cpp)'], 
-            'include_dirs': [
-               "<!@(node -p \"'<(msodbc_include_folders)'.split(' ').join(' ')\")",
-              '/usr/include/'
-            ],
-        }],
-        ['OS=="mac"', {
-            'link_settings': {
-             'libraries': [
-               '<(link_path)',
-               '<(linuxodbc)'
-             #'-lodbc'
-               ],
-            },
-            'defines': [
-              'LINUX_BUILD',
-              'UNICODE'
-            ],
-            'xcode_settings': {
-              'CLANG_CXX_LANGUAGE_STANDARD': '<(cflags_cpp)'
-            },
-            'include_dirs': [
-              "<!@(node -p \"'<(msodbc_include_folders)'.split(' ').join(' ')\")",
-              '/opt/homebrew/include',
-              '/usr/local/include/',
-            ],
-        }],
-      ]
-    }
-  ]
-}
diff --git a/package-lock.json b/package-lock.json
index 794b2b89..cae76b73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "@types/chai-as-promised": "^7.1.8",
         "@types/mocha": "^10.0.9",
         "@types/mochawesome": "^6.2.4",
-        "@types/node": "^22.7.5",
+        "@types/node": "^22.9.0",
         "@types/sequelize": "^4.28.20",
         "@typescript-eslint/eslint-plugin": "^6.11.0",
         "@typescript-eslint/parser": "^6.11.0",
@@ -1183,13 +1183,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
+      "version": "22.9.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz",
+      "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.19.8"
       }
     },
     "node_modules/@types/responselike": {
diff --git a/src/OdbcHandle.cpp b/src/OdbcHandle.cpp
index 93d750d5..d77e4595 100644
--- a/src/OdbcHandle.cpp
+++ b/src/OdbcHandle.cpp
@@ -83,14 +83,20 @@ namespace mssql
 		return handle;
 	} 
 
+	std::string OdbcHandle::trim(vector<SQLWCHAR>&v, SQLSMALLINT len) const {
+		auto take = min(v.capacity(), (size_t)len);
+		auto c_msg = swcvec2str(v, take);
+		return c_msg;
+	}
+
 	void OdbcHandle::read_errors(shared_ptr<vector<shared_ptr<OdbcError>>> & errors) const
 	{
 		SQLSMALLINT msg_len = 0;
 		SQLRETURN      rc2;
 		SQLINTEGER    native_error = 0;
 		vector<SQLWCHAR> msg;
-		msg.reserve(2 * 1024);
-		msg.resize(2 * 1024);
+		msg.reserve(10 * 1024);
+		msg.resize(10 * 1024);
 		vector<SQLWCHAR> sql_state;
 		sql_state.reserve(6);
 		sql_state.resize(6);
@@ -112,15 +118,14 @@ namespace mssql
 			if (rc2 < 0) {
 				break;
 			}
-		
-			auto c_msg = swcvec2str(msg, msg_len);
+			auto c_msg = trim(msg, msg_len);
 			auto c_state = swcvec2str(sql_state, sql_state.size());
 			const auto m = string(c_msg);
 			SQLGetDiagField(HandleType, handle, i, SQL_DIAG_SS_SEVERITY, &severity, SQL_IS_INTEGER, nullptr);
 			SQLGetDiagField(HandleType, handle, i, SQL_DIAG_SS_SRVNAME, serverName.data(), serverName.capacity(), &serverName_len);
-			const string c_serverName = swcvec2str(serverName, serverName_len);
+			const string c_serverName = trim(serverName, serverName_len);
 			SQLGetDiagField(HandleType, handle, i, SQL_DIAG_SS_PROCNAME, procName.data(), procName.capacity(), &procName_len);
-			const string c_procName = swcvec2str(procName, procName_len);
+			const string c_procName = trim(procName, procName_len);
 			SQLGetDiagField(HandleType, handle, i, SQL_DIAG_SS_LINE, &lineNumber, SQL_IS_UINTEGER, nullptr);
 			if (received.find(m) == received.end()) {
 				const auto last = make_shared<OdbcError>(c_state.c_str(), c_msg.c_str(), native_error, severity, c_serverName.c_str(), c_procName.c_str(), lineNumber);
diff --git a/src/OdbcHandle.h b/src/OdbcHandle.h
index 92bcad72..040bf2da 100644
--- a/src/OdbcHandle.h
+++ b/src/OdbcHandle.h
@@ -41,7 +41,7 @@ namespace mssql
 		void read_errors(shared_ptr<vector<shared_ptr<OdbcError>>> & errors) const;
       
     private:
-
+        std::string trim(vector<SQLWCHAR>&v, SQLSMALLINT len) const;
         void operator=(const OdbcHandle& orig) 
         {
             assert(false);