diff --git a/server/go/blobserver/localdisk.go b/server/go/blobserver/localdisk.go
index f74bf3383..8445ec735 100644
--- a/server/go/blobserver/localdisk.go
+++ b/server/go/blobserver/localdisk.go
@@ -45,14 +45,15 @@ func (ds *diskStorage) Remove(partition string, blobs []*blobref.BlobRef) os.Err
 	for _, blob := range blobs {
 		fileName := PartitionBlobFileName(partition, blob)
 		err := os.Remove(fileName)
-		if err == nil {
-			continue;
-		}
-		if errorIsNoEnt(err) {
+		switch {
+		case err == nil:
+			continue
+		case errorIsNoEnt(err):
 			log.Printf("Deleting already-deleted file; harmless.")
 			continue
+		default:
+			return err
 		}
-		return err
 	}
 	return nil
 }