diff --git a/Volume.cpp b/Volume.cpp
index 2f3cad5..4ac086b 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -213,6 +213,7 @@
     }
     setState(Volume::State_Formatting);
 
+    int ret = -1;
     if (initializeMbr(devicePath)) {
         SLOGE("Failed to initialize MBR (%s)", strerror(errno));
         goto err;
@@ -226,10 +227,11 @@
         goto err;
     }
 
-    setState(Volume::State_Idle);
-    return 0;
+    ret = 0;
+
 err:
-    return -1;
+    setState(Volume::State_Idle);
+    return ret;
 }
 
 bool Volume::isMountpointMounted(const char *path) {