Index: head/usr.sbin/efibootmgr/efibootmgr.c
===================================================================
--- head/usr.sbin/efibootmgr/efibootmgr.c
+++ head/usr.sbin/efibootmgr/efibootmgr.c
@@ -674,11 +674,16 @@
 		err(1, "bootvar creation");
 	if (loader == NULL)
 		errx(1, "Must specify boot loader");
-	if (efivar_unix_path_to_device_path(loader, &loaderdp) != 0)
-		err(1, "Cannot translate unix loader path '%s' to UEFI", loader);
+	ret = efivar_unix_path_to_device_path(loader, &loaderdp);
+	if (ret != 0)
+		errc(1, ret, "Cannot translate unix loader path '%s' to UEFI",
+		    loader);
 	if (kernel != NULL) {
-		if (efivar_unix_path_to_device_path(kernel, &kerneldp) != 0)
-			err(1, "Cannot translate unix kernel path '%s' to UEFI", kernel);
+		ret = efivar_unix_path_to_device_path(kernel, &kerneldp);
+		if (ret != 0)
+			errc(1, ret,
+			    "Cannot translate unix kernel path '%s' to UEFI",
+			    kernel);
 	} else {
 		kerneldp = NULL;
 	}