more fixes

Author: dignifiedquire

src/api/block.js

@@ -9,25 +9,29 @@ const streamToValue = require('../stream-to-value')
 module.exports = (send) => {
   return {
     get: promisify((args, opts, callback) => {
-      // TODO this needs to be adjusted with the new go-ipfs http-api
-      let cid
-      if (CID.isCID(args)) {
-        cid = args
-        args = multihash.toB58String(args.multihash)
-      } else if (Buffer.isBuffer(args)) {
-        cid = new CID(args)
-        args = multihash.toB58String(args)
-      } else if (typeof args == 'string') {
-        cid = new CID(args)
-      } else {
-        return callback(new Error('invalid argument'))
-      }
-
       if (typeof opts === 'function') {
         callback = opts
         opts = {}
       }
 
+      // TODO this needs to be adjusted with the new go-ipfs http-api
+      let cid
+      try {
+        if (CID.isCID(args)) {
+          cid = args
+          args = multihash.toB58String(args.multihash)
+        } else if (Buffer.isBuffer(args)) {
+          cid = new CID(args)
+          args = multihash.toB58String(args)
+        } else if (typeof args === 'string') {
+          cid = new CID(args)
+        } else {
+          return callback(new Error('invalid argument'))
+        }
+      } catch (err) {
+        return callback(err)
+      }
+
       // Transform the response from Buffer or a Stream to a Block
       const transform = (res, callback) => {
         if (Buffer.isBuffer(res)) {

src/request-api.js

@@ -18,6 +18,7 @@ function parseError (res, cb) {
     if (err) {
       return cb(err)
     }
+
     if (payload) {
       error.code = payload.Code
       error.message = payload.Message || payload.toString()