diff --git a/src/metadata.py b/src/metadata.py
index 5911742b1b37e099f173a3eb134cbcd2e95e472a..92e689254b724d23f9a3d3828825d4e65ec7a11c 100644
--- a/src/metadata.py
+++ b/src/metadata.py
@@ -84,6 +84,8 @@ def get_metadata_keys(obj):
 
 def set_metadata(obj, key, value):
     # TODO: Fix this with upgrade to py3
+    if value is None:
+        return
     try:
         obj.setMetaData(key, value)
     except UnicodeEncodeError: