diff --git a/lib/modules/ipfs/upload.js b/lib/modules/ipfs/upload.js
index ea9432f3..da9e6191 100644
--- a/lib/modules/ipfs/upload.js
+++ b/lib/modules/ipfs/upload.js
@@ -16,9 +16,9 @@ class IPFS {
     let self = this;
     async.waterfall([
       function findBinary(callback) {
-        let ipfs_bin = shelljs.exec('which ' + self.configIpfsBin).output.split("\n")[0];
+        let ipfs_bin = shelljs.which(self.configIpfsBin);
 
-        if (ipfs_bin === 'ipfs not found' || ipfs_bin === '') {
+        if (ipfs_bin === 'ipfs not found' || !ipfs_bin) {
           console.log(('=== WARNING: ' + self.configIpfsBin + ' not found or not in the path. Guessing ~/go/bin/ipfs for path').yellow);
           ipfs_bin = "~/go/bin/ipfs";
         }
@@ -26,7 +26,7 @@ class IPFS {
         return callback(null, ipfs_bin);
       },
       function runCommand(ipfs_bin, callback) {
-        let cmd = ipfs_bin + " add -r " + self.buildDir;
+        let cmd = `"${ipfs_bin}" add -r ${self.buildDir}`;
         console.log(("=== adding " + self.buildDir + " to ipfs").green);
         console.log(cmd.green);
         let result = shelljs.exec(cmd);
diff --git a/lib/modules/swarm/upload.js b/lib/modules/swarm/upload.js
index af14759a..4ba0a9b3 100644
--- a/lib/modules/swarm/upload.js
+++ b/lib/modules/swarm/upload.js
@@ -12,9 +12,9 @@ class Swarm {
     let self = this;
     async.waterfall([
       function findBinary(callback) {
-        let swarm_bin = shelljs.exec('which swarm').output.split("\n")[0];
+        let swarm_bin = shelljs.which('swarm');
 
-        if (swarm_bin === 'swarm not found' || swarm_bin === '') {
+        if (swarm_bin === 'swarm not found' || !swarm_bin) {
           console.log('=== WARNING: Swarm not in an executable path. Guessing ~/go/bin/swarm for path'.yellow);
           swarm_bin = "~/go/bin/swarm";
         }
@@ -22,7 +22,7 @@ class Swarm {
         return callback(null, swarm_bin);
       },
       function runCommand(swarm_bin, callback) {
-        let cmd = swarm_bin + " --defaultpath " + self.buildDir + "index.html --recursive up " + self.buildDir;
+        let cmd = `"${swarm_bin}" --defaultpath ${self.buildDir} index.html --recursive up ${self.buildDir}`;
         console.log(("=== adding " + self.buildDir + " to swarm").green);
         console.log(cmd.green);
         let result = shelljs.exec(cmd);