diff --git a/webapp.js b/webapp.js
index 158ba80..5593b40 100644
--- a/webapp.js
+++ b/webapp.js
@@ -66,7 +66,7 @@ module.exports = {
       });
 
     app.get('/apps/:id', function (req, res) {
-      var config = req.user.jobplugins.heroku
+      var config = req.user.jobPluginData('heroku') || {}
       if (!config || !config.accounts) return res.send(404, 'Account not found')
       var account;
       for (var i=0; i<config.accounts.length; i++) {
@@ -88,7 +88,7 @@ module.exports = {
     })
 
     app.del('/account/:id', function (req, res) {
-      var config = req.user.jobplugins.heroku
+      var config = req.user.jobPluginData('heroku') || {}
       if (!config || !config.accounts) return res.send(404, 'Account not found')
       var account;
       for (var i=0; i<config.accounts.length; i++) {
diff --git a/worker.js b/worker.js
index 00d0fe0..6c2d301 100644
--- a/worker.js
+++ b/worker.js
@@ -4,13 +4,15 @@ var git = require('strider-git/lib')
 module.exports = {
   init: function (userConfig, config, job, context, cb) {
     var account
+      , err = new Error('Heroku invalid configuration. Account not found')
+    if (!userConfig) return cb(err)
     for (var i=0; i<userConfig.accounts.length; i++) {
       if (userConfig.accounts[i].id === config.app.account) {
         account = userConfig.accounts[i]
         break;
       }
     }
-    if (!account) return cb(new Error('Heroku invalid configuration. Account not found'))
+    if (!account) return cb(err)
     cb(null, {
       deploy: function (context, done) {
         var cmd = 'git push ' + config.app.git_url + ' ' + context.branch + ':master'