diff --git a/zerobin/paste.py b/zerobin/paste.py
index f2de129..e92cd1a 100644
--- a/zerobin/paste.py
+++ b/zerobin/paste.py
@@ -158,7 +158,7 @@ class Paste(object):
 
                 #remove lock file
                 os.remove(lock_file)
-            except (IOError, OSError):
+            finally:
                 if os.path.isfile(lock_file):
                     #remove lock file
                     os.remove(lock_file)
diff --git a/zerobin/routes.py b/zerobin/routes.py
index d166e77..5d4d038 100644
--- a/zerobin/routes.py
+++ b/zerobin/routes.py
@@ -117,7 +117,6 @@ def display_paste(paste_id):
             raise ValueError()
 
     except (TypeError, ValueError):
-        #abort(404, u"This paste doesn't exist or has expired")
         return error404(ValueError)
 
     context = {'paste': paste, 'keep_alive': keep_alive}
@@ -137,7 +136,7 @@ def server_static(filename):
 
 def get_app(debug=None, settings_file='', compressed_static=None):
     """
-        Return a tuple (settings, app) configured using passed options and
+        Return a tuple (settings, app) configured using passed parameters and/or
         a setting file.
     """
     if settings_file:
diff --git a/zerobin/static/js/behavior.js b/zerobin/static/js/behavior.js
index 97e79ec..56f2b7f 100644
--- a/zerobin/static/js/behavior.js
+++ b/zerobin/static/js/behavior.js
@@ -163,7 +163,7 @@ window.zerobin = {
       are prefixed with with the passed version (default being this lib
       version) */
   getLocalStorageKeys: function(){
-    version = 'zerobinV0.1';
+    var version = 'zerobinV0.1';
     var keys = [];
     for (var key in localStorage){
        if (key.indexOf(version) !== -1){
@@ -674,10 +674,24 @@ $('.email-link').each(function(i, elem){
 
 });
 
+/* Show the page using javascript. Non js enabled browser will see an
+   error message */
 $('#wrap-content').each(function(i, elem){
     $(elem).show();
 });
 
+/* Remove expired pasted from history */
+if (zerobin.support.history && zerobin.paste_not_found){
+  var paste_id = zerobin.getPasteId();
+  var keys = zerobin.getLocalStorageKeys();
+  $.each(keys, function(i, key){
+     if (localStorage[key].indexOf(paste_id) !== -1){
+        localStorage.removeItem(key);
+        return false;
+     }
+  });
+}
+
 
 }); /* End of "document ready" jquery callback */
 
diff --git a/zerobin/views/404.tpl b/zerobin/views/404.tpl
index 5b2d98f..58af4fd 100644
--- a/zerobin/views/404.tpl
+++ b/zerobin/views/404.tpl
@@ -1,3 +1,7 @@
+<script type="text/javascript">
+  zerobin.paste_not_found = true;
+</script>
+
 <p class="alert alert-error">
   <a class="close" data-dismiss="alert" href="#">×</a>
   <strong class="title">404 Error!</strong>