diff --git a/README.md b/README.md
index 8bc2651..45f2e03 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,10 @@ Simple app containing a mixin model that integrates modeltranslation
 
 ## Release Notes
 
+## v0.0.8
+
+- Fixed issue related to deleting a non existing key on PAGE_EDIT_HANDLER dict
+
 ## v0.0.7
 
 - Fixed set_url_path() translatable model method
diff --git a/dist/wagtail-modeltranslation-0.0.8.tar.gz b/dist/wagtail-modeltranslation-0.0.8.tar.gz
new file mode 100644
index 0000000..31d431d
Binary files /dev/null and b/dist/wagtail-modeltranslation-0.0.8.tar.gz differ
diff --git a/setup.py b/setup.py
index 3a28966..0692f52 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setup(
     name='wagtail-modeltranslation',
-    version='0.0.7',
+    version='0.0.8',
     packages=['wagtail_modeltranslation'],
     include_package_data=True,
     license='BSD License',
diff --git a/wagtail_modeltranslation.egg-info/PKG-INFO b/wagtail_modeltranslation.egg-info/PKG-INFO
index 2e431c9..bff7560 100644
--- a/wagtail_modeltranslation.egg-info/PKG-INFO
+++ b/wagtail_modeltranslation.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: wagtail-modeltranslation
-Version: 0.0.7
+Version: 0.0.8
 Summary: Integration of django-modeltranslation with Wagtail CMS
 Home-page: https://github.com/infoportugal/wagtail-modeltranslation
 Author: Rui Martins
@@ -11,6 +11,8 @@ Description: # Wagtail modeltranslation
         Simple app containing a mixin model that integrates modeltranslation
         (https://github.com/deschler/django-modeltranslation) into wagtail panels system.
         
+        ![alt tag](https://github.com/infoportugal/wagtail-modeltranslation/blob/master/screenshot.png?raw=true)
+        
         ## Quick start
         
         1. Make sure you have django-modeltranslation installed:
@@ -53,6 +55,10 @@ Description: # Wagtail modeltranslation
         
         ## Release Notes
         
+        ## v0.0.8
+        
+        - Fixed issue related to deleting a non existing key on PAGE_EDIT_HANDLER dict
+        
         ## v0.0.7
         
         - Fixed set_url_path() translatable model method
diff --git a/wagtail_modeltranslation/models.py b/wagtail_modeltranslation/models.py
index 32b0d80..f62bc09 100644
--- a/wagtail_modeltranslation/models.py
+++ b/wagtail_modeltranslation/models.py
@@ -51,7 +51,8 @@ class TranslationMixin(object):
 
         # DELETE TEMPORARY EDIT HANDLER IN ORDER TO LET WAGTAIL RECONSTRUCT
         # NEW EDIT HANDLER BASED ON NEW TRANSLATION PANELS
-        del PAGE_EDIT_HANDLERS[self.__class__]
+        if self.__class__ in PAGE_EDIT_HANDLERS:
+            del PAGE_EDIT_HANDLERS[self.__class__]
 
     def _fetch_defined_tabs(self):
         """