diff --git a/app/controllers/transactions.js b/app/controllers/transactions.js
index 933a6f7..94d2ba3 100644
--- a/app/controllers/transactions.js
+++ b/app/controllers/transactions.js
@@ -42,6 +42,9 @@ var getTransaction = function(txid, cb) {
       console.log(err);
       return cb(err);
     }
+
+    if (!tx) return cb(new Error('Transaction not found'));
+
     return cb(null, tx.info);
   });
 };
@@ -79,13 +82,17 @@ exports.list = function(req, res, next) {
         txs = block.info.tx;
       }
 
-      async.mapSeries(txs, getTransaction,
-        function(err, results) {
-          res.jsonp({
-            pagesTotal: pagesTotal,
-            txs: results
-          });
+      async.mapSeries(txs, getTransaction, function(err, results) {
+        if (err) {
+          console.log(err);
+          res.status(404).send('TX not found');
+        }
+
+        res.jsonp({
+          pagesTotal: pagesTotal,
+          txs: results
         });
+      });
     });
   }
   else if (addrStr) {
@@ -109,13 +116,17 @@ exports.list = function(req, res, next) {
         txs = a.transactions;
       }
 
-      async.mapSeries(txs, getTransaction,
-        function(err, results) {
-          res.jsonp({
-            pagesTotal: pagesTotal,
-            txs: results
-          });
+      async.mapSeries(txs, getTransaction, function(err, results) {
+        if (err) {
+          console.log(err);
+          res.status(404).send('TX not found');
+        }
+
+        res.jsonp({
+          pagesTotal: pagesTotal,
+          txs: results
         });
+      });
     });
   }
   else {
@@ -133,6 +144,11 @@ exports.list = function(req, res, next) {
           }
 
           async.mapSeries(txids, getTransaction, function(err, alltxs) {
+            if (err) {
+              console.log(err);
+              res.status(404).send('TX not found');
+            }
+
             res.jsonp({
               txs: alltxs,
               length: alltxs.length
diff --git a/public/js/controllers/blocks.js b/public/js/controllers/blocks.js
index f599b7e..cbd2871 100644
--- a/public/js/controllers/blocks.js
+++ b/public/js/controllers/blocks.js
@@ -3,6 +3,7 @@
 angular.module('insight.blocks').controller('BlocksController',
   function($scope, $rootScope, $routeParams, $location, Global, Block, Blocks, BlockByHeight) {
   $scope.global = Global;
+  $scope.loading = false;
 
   if ($routeParams.blockHeight) {
     BlockByHeight.get({
@@ -16,18 +17,24 @@ angular.module('insight.blocks').controller('BlocksController',
   }
 
   $scope.list = function() {
+    $scope.loading = true;
+
     Blocks.get({
       blockDate: $routeParams.blockDate
     }, function(res) {
+      $scope.loading = false;
       $scope.blocks = res.blocks;
       $scope.pagination = res.pagination;
     });
   };
 
   $scope.findOne = function() {
+    $scope.loading = true;
+
     Block.get({
       blockHash: $routeParams.blockHash
     }, function(block) {
+      $scope.loading = false;
       $scope.block = block;
     }, function(e) {
       if (e.status === 400) {
diff --git a/public/views/blocks/list.html b/public/views/blocks/list.html
index 3dcd32e..96f881b 100644
--- a/public/views/blocks/list.html
+++ b/public/views/blocks/list.html
@@ -33,11 +33,11 @@
           </tr>
         </thead>
         <tbody>
-        <tr data-ng-show="!blocks.length"><td colspan="5">Waiting for blocks...</td></tr>
+        <tr data-ng-show="loading">
+          <td colspan="5">Waiting for blocks...</td>
+        </tr>
         <tr class="fader" data-ng-repeat='b in blocks'>
-          <td>
-            <a href="/#!/block/{{b.hash}}">{{b.height}}</a>
-          </td>
+          <td><a href="/#!/block/{{b.hash}}">{{b.height}}</a></td>
           <td>{{b.time * 1000 | date:'medium'}}</td>
           <td>{{b.tx.length}}</td>
           <td>{{b.size}}</td>
@@ -47,5 +47,5 @@
       </table>
     </div>
   </div>
-  <h2 class="text-center text-muted" data-ng-hide="!blocks || blocks.length">No blocks yet.</h2>
+  <h2 class="text-center text-muted" data-ng-show="!blocks.length">No blocks yet.</h2>
 </section>