diff --git a/updater/blockimg.c b/updater/blockimg.c
index a0e9aec..0e2ba44 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1424,7 +1424,6 @@
 
     if (!S_ISBLK(st.st_mode)) {
         fprintf(stderr, "not a block device; skipping erase\n");
-        rc = 0;
         goto pceout;
     }
 
@@ -1448,7 +1447,7 @@
 
             if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) {
                 fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));
-                // Continue anyway, nothing we can do
+                goto pceout;
             }
         }
     }