diff --git a/api/controllers/blocks.js b/api/controllers/blocks.js
index f316e255..a1ed647e 100644
--- a/api/controllers/blocks.js
+++ b/api/controllers/blocks.js
@@ -48,6 +48,9 @@ Blocks.heightParam = function(req, res, next, height) {
     .then(next)
     .catch(BitcoreNode.errors.Blocks.NotFound, function() {
       res.status(404).send('Block with height ' + height + ' not found');
+    })
+    .catch(function() {
+      console.log(arguments);
     });
 };
 
diff --git a/api/test/v1/blocks.js b/api/test/v1/blocks.js
index 73e32266..863de1e9 100644
--- a/api/test/v1/blocks.js
+++ b/api/test/v1/blocks.js
@@ -64,7 +64,7 @@ describe('BitcoreHTTP v1 blocks routes', function() {
     return b.toObject();
   };
 
-  describe.only('/blocks', function() {
+  describe('/blocks', function() {
     it('works with default parameters', function(cb) {
       agent.get('/v1/blocks/?from=100000')
         .expect(200)
diff --git a/lib/services/block.js b/lib/services/block.js
index 7920f92d..d499e6c1 100644
--- a/lib/services/block.js
+++ b/lib/services/block.js
@@ -109,12 +109,11 @@ BlockService.blockRPCtoBitcore = function(blockData) {
  * @return {Promise} a promise that will always be rejected
  */
 var blockNotFound = function(err) {
-  if (err instanceof Error) {
-    throw err;
-  }
-  if (err.message === 'Block not found') {
+  if (err.message === 'Block not found' ||
+    err.message === 'Block height out of range') {
     throw new errors.Blocks.NotFound();
   }
+  throw err;
 };
 
 /**