Merge branch 'master' into transactionControllerRefractor

1 files changed, 2 insertions, 1 deletions

diff --git a/app/scripts/lib/nodeify.js b/app/scripts/lib/nodeify.js
index 299bfe624..832d6c6d3 100644
--- a/app/scripts/lib/nodeify.js
+++ b/app/scripts/lib/nodeify.js
@@ -1,9 +1,10 @@
 const promiseToCallback = require('promise-to-callback')
 
-module.exports = function(fn, context) {
+module.exports = function nodeify (fn, context) {
   return function(){
     const args = [].slice.call(arguments)
     const callback = args.pop()
+    if (typeof callback !== 'function') throw new Error('callback is not a function')
     promiseToCallback(fn.apply(context, args))(callback)
   }
 }