diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h
index 1c8ee34..b7b9cd9 100644
--- a/libusb/os/windows_winusb.h
+++ b/libusb/os/windows_winusb.h
@@ -244,8 +244,10 @@ static inline void windows_device_priv_release(struct libusb_device *dev)
 	int i;
 
 	free(p->path);
-	for (i = 0; i < dev->num_configurations; i++)
-		free(p->config_descriptor[i]);
+	if ((dev->num_configurations > 0) && (p->config_descriptor != NULL)) {
+		for (i = 0; i < dev->num_configurations; i++)
+			free(p->config_descriptor[i]);
+	}
 	free(p->config_descriptor);
 	free(p->hid);
 	for (i = 0; i < USB_MAXINTERFACES; i++) {
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index e9614aa..33169bc 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11197
+#define LIBUSB_NANO 11198