diff --git a/lib/HistoricSync.js b/lib/HistoricSync.js
index f29e77bc..691969dc 100644
--- a/lib/HistoricSync.js
+++ b/lib/HistoricSync.js
@@ -288,6 +288,7 @@ function spec() {
         },
         function (w_cb) {
           self.getBlockFromFile(function(err,b) {
+            if (!b) return w_cb('Could not find block ' + self.startBlock);
             h=b.hash;
             setImmediate(function(){
               return w_cb(err);
diff --git a/public/src/js/directives.js b/public/src/js/directives.js
index e5762456..39a7c77f 100644
--- a/public/src/js/directives.js
+++ b/public/src/js/directives.js
@@ -49,14 +49,15 @@ angular.module('insight')
           };
 
           client.on('mousedown', onMousedown);
-          client.on('noflash wrongflash', function() {
-            return elm.remove();
-          });
 
           scope.$on('$destroy', function() {
             client.off('mousedown', onMousedown);
           });
         });
+
+        clip.on('noFlash wrongflash', function() {
+          return elm.remove();
+        });
       }
     };
   });