diff --git a/routes/search.js b/routes/search.js
index 57564fb..e427040 100644
--- a/routes/search.js
+++ b/routes/search.js
@@ -54,7 +54,8 @@ export default function* () {
 
     this.body = share;
   } catch (e) {
-    this.throw(400, { error: { message: 'Unexpected error looking up music. Please try again later.' } });
+    debug(e);
+    this.throw(500, { error: { message: 'Unexpected error looking up music. Please try again later.' } });
     throw e;
   }
 }
diff --git a/worker.js b/worker.js
index e870a23..2f840b8 100644
--- a/worker.js
+++ b/worker.js
@@ -1,10 +1,13 @@
 import co from 'co';
 import kue from 'kue';
 import raven from 'raven';
+import debuglog from 'debug';
 
 import models from './models';
 import services from './lib/services';
 
+const debug = debuglog('combine.fm:worker');
+
 raven.config(process.env.SENTRY_DSN).install();
 
 const queue = kue.createQueue({
@@ -14,7 +17,7 @@ const queue = kue.createQueue({
 function search(data, done) {
   const share = data.share;
   const service = services.find(item => data.service.id === item.id);
-  console.log(service);
+  debug(`Searching on: ${service}`);
   co(function* gen() { // eslint-disable-line no-loop-func
     try {
       const match = yield service.search(share);
@@ -49,7 +52,9 @@ function search(data, done) {
       return done(err);
     }
   }).catch((err) => {
-    console.log(err);
+    debug(`Error searching on: ${service}`);
+    debug(share);
+    debug(err);
     raven.captureException(err);
     return done();
   });