diff --git a/build/actions/notes.js b/build/actions/notes.js
index 63ed3ae9..880f0b5e 100644
--- a/build/actions/notes.js
+++ b/build/actions/notes.js
@@ -1,5 +1,7 @@
 (function() {
-  var _, resin;
+  var Promise, _, resin;
+
+  Promise = require('bluebird');
 
   _ = require('lodash');
 
@@ -20,10 +22,12 @@
     ],
     permission: 'user',
     action: function(params, options, done) {
-      if (_.isEmpty(params.note)) {
-        return done(new Error('Missing note content'));
-      }
-      return resin.models.device.note(options.device, params.note).nodeify(done);
+      return Promise["try"](function() {
+        if (_.isEmpty(params.note)) {
+          throw new Error('Missing note content');
+        }
+        return resin.models.device.note(options.device, params.note);
+      }).nodeify(done);
     }
   };
 
diff --git a/lib/actions/notes.coffee b/lib/actions/notes.coffee
index e4e9964f..be6838a7 100644
--- a/lib/actions/notes.coffee
+++ b/lib/actions/notes.coffee
@@ -1,3 +1,4 @@
+Promise = require('bluebird')
 _ = require('lodash')
 resin = require('resin-sdk')
 
@@ -25,8 +26,9 @@ exports.set =
 	]
 	permission: 'user'
 	action: (params, options, done) ->
+		Promise.try ->
+			if _.isEmpty(params.note)
+				throw new Error('Missing note content')
 
-		if _.isEmpty(params.note)
-			return done(new Error('Missing note content'))
-
-		resin.models.device.note(options.device, params.note).nodeify(done)
+			resin.models.device.note(options.device, params.note)
+		.nodeify(done)