diff --git a/devicemodel/hw/pci/npk.c b/devicemodel/hw/pci/npk.c
index 7dce94630..88aae2d69 100644
--- a/devicemodel/hw/pci/npk.c
+++ b/devicemodel/hw/pci/npk.c
@@ -234,7 +234,6 @@ static int pci_npk_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
 		else
 			break;
 	}
-	closedir(dir);
 
 	if (!dent) {
 		WPRINTF(("Cannot find NPK device\n"));
@@ -246,9 +245,11 @@ static int pci_npk_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
 			dent->d_name);
 	if (rc > PATH_MAX)
 		WPRINTF(("NPK device name too long\n"));
+
+	closedir(dir);
 	fd = open(name, O_RDONLY);
 	if (fd == -1) {
-		WPRINTF(("Cannot open host NPK config\n"));
+		WPRINTF(("Cannot open host NPK config:%s\n", name));
 		return error;
 	}