diff --git a/src/cli/cp.js b/src/cli/cp.js
index 50c478a..737d8bd 100644
--- a/src/cli/cp.js
+++ b/src/cli/cp.js
@@ -41,10 +41,12 @@ module.exports = {
       hash
     } = argv
 
-    return ipfs.files.cp(source, dest, {
-      parents,
-      format,
-      hashAlg: hash
-    })
+    argv.resolve(
+      ipfs.files.cp(source, dest, {
+        parents,
+        format,
+        hashAlg: hash
+      })
+    )
   }
 }
diff --git a/src/cli/flush.js b/src/cli/flush.js
index 2244367..08db794 100644
--- a/src/cli/flush.js
+++ b/src/cli/flush.js
@@ -17,6 +17,8 @@ module.exports = {
       ipfs
     } = argv
 
-    return ipfs.files.flush(path || FILE_SEPARATOR, {})
+    argv.resolve(
+      ipfs.files.flush(path || FILE_SEPARATOR, {})
+    )
   }
 }
diff --git a/src/cli/ls.js b/src/cli/ls.js
index de52a2c..fc57fae 100644
--- a/src/cli/ls.js
+++ b/src/cli/ls.js
@@ -30,45 +30,47 @@ module.exports = {
       long
     } = argv
 
-    return ipfs.files.ls(path || FILE_SEPARATOR)
-      .then(files => {
-        if (long) {
-          const table = []
-          const lengths = {}
-
-          files.forEach(link => {
-            const row = {
-              name: `${link.name}`,
-              hash: `${link.hash}`,
-              size: `${link.size}`
-            }
-
-            Object.keys(row).forEach(key => {
-              const value = row[key]
-
-              lengths[key] = lengths[key] > value.length ? lengths[key] : value.length
+    argv.resolve(
+      ipfs.files.ls(path || FILE_SEPARATOR)
+        .then(files => {
+          if (long) {
+            const table = []
+            const lengths = {}
+
+            files.forEach(link => {
+              const row = {
+                name: `${link.name}`,
+                hash: `${link.hash}`,
+                size: `${link.size}`
+              }
+
+              Object.keys(row).forEach(key => {
+                const value = row[key]
+
+                lengths[key] = lengths[key] > value.length ? lengths[key] : value.length
+              })
+
+              table.push(row)
             })
 
-            table.push(row)
-          })
+            table.forEach(row => {
+              let line = ''
 
-          table.forEach(row => {
-            let line = ''
+              Object.keys(row).forEach(key => {
+                const value = row[key]
 
-            Object.keys(row).forEach(key => {
-              const value = row[key]
+                line += value.padEnd(lengths[key])
+                line += '\t'
+              })
 
-              line += value.padEnd(lengths[key])
-              line += '\t'
+              print(line)
             })
 
-            print(line)
-          })
+            return
+          }
 
-          return
-        }
-
-        files.forEach(link => print(link.name))
-      })
+          files.forEach(link => print(link.name))
+        })
+    )
   }
 }
diff --git a/src/cli/mkdir.js b/src/cli/mkdir.js
index e0086f2..7bbf987 100644
--- a/src/cli/mkdir.js
+++ b/src/cli/mkdir.js
@@ -44,11 +44,13 @@ module.exports = {
       flush
     } = argv
 
-    return ipfs.files.mkdir(path, {
-      parents,
-      cidVersion,
-      hash,
-      flush
-    })
+    argv.resolve(
+      ipfs.files.mkdir(path, {
+        parents,
+        cidVersion,
+        hash,
+        flush
+      })
+    )
   }
 }
diff --git a/src/cli/mv.js b/src/cli/mv.js
index 0f3e324..c79d064 100644
--- a/src/cli/mv.js
+++ b/src/cli/mv.js
@@ -35,9 +35,11 @@ module.exports = {
       recursive
     } = argv
 
-    return ipfs.files.mv(source, dest, {
-      parents,
-      recursive
-    })
+    argv.resolve(
+      ipfs.files.mv(source, dest, {
+        parents,
+        recursive
+      })
+    )
   }
 }
diff --git a/src/cli/read.js b/src/cli/read.js
index 059e639..3b8ad14 100644
--- a/src/cli/read.js
+++ b/src/cli/read.js
@@ -34,28 +34,30 @@ module.exports = {
       length
     } = argv
 
-    return new Promise((resolve, reject) => {
-      waterfall([
-        (cb) => ipfs.files.readPullStream(path, {
-          offset,
-          length
-        }, cb),
-        (stream, cb) => {
-          pull(
-            stream,
-            through(buffer => {
-              print(buffer, false)
-            }),
-            collect(cb)
-          )
-        }
-      ], (error) => {
-        if (error) {
-          return reject(error)
-        }
+    argv.resolve(
+      new Promise((resolve, reject) => {
+        waterfall([
+          (cb) => ipfs.files.readPullStream(path, {
+            offset,
+            length
+          }, cb),
+          (stream, cb) => {
+            pull(
+              stream,
+              through(buffer => {
+                print(buffer, false)
+              }),
+              collect(cb)
+            )
+          }
+        ], (error) => {
+          if (error) {
+            return reject(error)
+          }
 
-        resolve()
+          resolve()
+        })
       })
-    })
+    )
   }
 }
diff --git a/src/cli/rm.js b/src/cli/rm.js
index 54fd3fe..fac187a 100644
--- a/src/cli/rm.js
+++ b/src/cli/rm.js
@@ -26,8 +26,10 @@ module.exports = {
       recursive
     } = argv
 
-    return ipfs.files.rm(path, {
-      recursive
-    })
+    argv.resolve(
+      ipfs.files.rm(path, {
+        recursive
+      })
+    )
   }
 }
diff --git a/src/cli/stat.js b/src/cli/stat.js
index 7bf9eb9..2a5c809 100644
--- a/src/cli/stat.js
+++ b/src/cli/stat.js
@@ -54,25 +54,27 @@ Type: <type>`,
       withLocal
     } = argv
 
-    return ipfs.files.stat(path, {
-      withLocal
-    })
-      .then((stats) => {
-        if (hash) {
-          return print(stats.hash)
-        }
+    argv.resolve(
+      ipfs.files.stat(path, {
+        withLocal
+      })
+        .then((stats) => {
+          if (hash) {
+            return print(stats.hash)
+          }
 
-        if (size) {
-          return print(stats.size)
-        }
+          if (size) {
+            return print(stats.size)
+          }
 
-        print(format
-          .replace('<hash>', stats.hash)
-          .replace('<size>', stats.size)
-          .replace('<cumulsize>', stats.cumulativeSize)
-          .replace('<childs>', stats.blocks)
-          .replace('<type>', stats.type)
-        )
-      })
+          print(format
+            .replace('<hash>', stats.hash)
+            .replace('<size>', stats.size)
+            .replace('<cumulsize>', stats.cumulativeSize)
+            .replace('<childs>', stats.blocks)
+            .replace('<type>', stats.type)
+          )
+        })
+    )
   }
 }
diff --git a/src/cli/write.js b/src/cli/write.js
index e57de92..4ee40e4 100644
--- a/src/cli/write.js
+++ b/src/cli/write.js
@@ -85,19 +85,21 @@ module.exports = {
       flush
     } = argv
 
-    return ipfs.files.write(path, process.stdin, {
-      offset,
-      length,
-      create,
-      truncate,
-      rawLeaves,
-      cidVersion,
-      hashAlg,
-      format,
-      parents,
-      progress,
-      strategy,
-      flush
-    })
+    argv.resolve(
+      ipfs.files.write(path, process.stdin, {
+        offset,
+        length,
+        create,
+        truncate,
+        rawLeaves,
+        cidVersion,
+        hashAlg,
+        format,
+        parents,
+        progress,
+        strategy,
+        flush
+      })
+    )
   }
 }