diff --git a/examples/hotplugtest.c b/examples/hotplugtest.c
index fef01aff..6cdf0c86 100644
--- a/examples/hotplugtest.c
+++ b/examples/hotplugtest.c
@@ -65,7 +65,12 @@ int main(int argc, char *argv[])
 	product_id = (argc > 2) ? strtol (argv[2], NULL, 0) : 0x5005;
 	class_id   = (argc > 3) ? strtol (argv[3], NULL, 0) : LIBUSB_HOTPLUG_MATCH_ANY;
 
-	libusb_init (NULL);
+	rc = libusb_init (NULL);
+	if (rc < 0)
+	{
+		printf("failed to initialise libusb: %s\n", libusb_error_name(rc));
+		return EXIT_FAILURE;
+	}
 
 	if (!libusb_has_capability (LIBUSB_CAP_HAS_HOTPLUG)) {
 		printf ("Hotplug capabilites are not supported on this platform\n");
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index a833d52c..a3879902 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10839
+#define LIBUSB_NANO 10840