diff --git a/Makefile b/Makefile
index 9aeb23e..01c2325 100644
--- a/Makefile
+++ b/Makefile
@@ -58,5 +58,5 @@ clean:
 	@echo "Cleaning..."
 	@(cd src; $(MAKE) clean)
 	@(cd tests; $(MAKE) clean)
-	@rm -rf bin
+	@rm -rf bin iodine-latest-win32*
 
diff --git a/src/tun.c b/src/tun.c
index 86f8a89..eb3e4e2 100644
--- a/src/tun.c
+++ b/src/tun.c
@@ -264,8 +264,10 @@ open_tun(const char *tun_device)
 	memset(adapter, 0, sizeof(adapter));
 	get_device(adapter, sizeof(adapter));
 
-	if (strlen(adapter) == 0)
+	if (strlen(adapter) == 0) {
+		warnx("No TAP adapters found. See README-win32.txt for help.\n");
 		return -1;
+	}
 	
 	snprintf(tapfile, sizeof(tapfile), "%s%s.tap", TAP_DEVICE_SPACE, adapter);
 	printf("Opening device %s\n", tapfile);