From 6efd595851047515eb19a3d8c6e708a1aa110612 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Fri, 2 May 2014 11:18:41 -0400
Subject: [PATCH 1/3] fixed unpaired connection bug

---
 lib/app.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/app.js b/lib/app.js
index 1e6845a3..67231bad 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -2,9 +2,7 @@
 
 var http = require('http');
 var https = require('https');
-var path = require('path');
 var express = require('express');
-var fs = require('fs');
 var LamassuConfig = require('lamassu-config');
 var routes = require('./routes');
 var Trader = require('./trader');
@@ -80,9 +78,9 @@ module.exports = function (options) {
           return next(serverError); 
         }
         if (!device) {
-          var pairError = new Error('Not Found');
-          pairError.status = 404;
-          return next(pairError); 
+          res.statusCode = 404;
+          res.json({err: 'Not Found'});
+          return next(new Error('Device is unpaired')); 
         }
         next();
       });

From 955cc634a22f1bc4d45bbe460c900b0cabc61b1f Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Fri, 2 May 2014 11:19:16 -0400
Subject: [PATCH 2/3] 0.4.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index de9994be..2fc167c2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "lamassu-server",
   "description": "bitcoin atm client server protocol module",
   "keywords": [],
-  "version": "0.4.5",
+  "version": "0.4.6",
   "license": "unlicense",
   "author": "Lamassu (https://lamassu.is)",
   "engines": {

From 72e7c8addce442de4b6cbc78f52f274fde6b7356 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Sat, 3 May 2014 16:26:32 -0400
Subject: [PATCH 3/3] return json on all server errors

---
 lib/app.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/app.js b/lib/app.js
index 67231bad..8cca2e35 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -73,9 +73,8 @@ module.exports = function (options) {
 
       config.isAuthorized(fingerprint, function (err, device) {
         if (err) { 
-          var serverError = new Error('Internal Server Error');
-          serverError.status = 500;
-          return next(serverError); 
+          res.json({err: 'Internal Server Error'});
+          return next(err); 
         }
         if (!device) {
           res.statusCode = 404;