diff --git a/organize_my_photos.py b/organize_my_photos.py
index 6d77249..2399626 100644
--- a/organize_my_photos.py
+++ b/organize_my_photos.py
@@ -14,7 +14,7 @@ def get_date_created(filename):
     image = Image.open(filename)
     image.verify()
     # Format date d/m/Y
-    if image._getexif()[36867]:
+    if image._getexif() is not None and '36867' in image._getexif():
         # Metadata
         return time.strftime('%d/%m/%Y', datetime.datetime.strptime(image._getexif()[36867], "%Y:%m:%d %H:%M:%S").timetuple())
     else:
diff --git a/setup.py b/setup.py
index c603f8e..9988bd9 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 setup(
   name = 'Organize-my-photos',
   py_modules=['organize_my_photos'],
-  version = '1.0.3',
+  version = '1.0.4',
   python_requires='>3.6',
   description = 'Terminal program that organizes and organizes the photographs in folders by year, month and day.',
   author = 'Andros Fenollosa',