diff --git a/templates/gspecies_compose.yml.j2 b/templates/gspecies_compose.yml.j2
index 1b1e8f8f692ff0d745dc27448c196bd3dd1ba617..82bb8ee16f2fc73a2648ba7457aeb60e286c1b06 100644
--- a/templates/gspecies_compose.yml.j2
+++ b/templates/gspecies_compose.yml.j2
@@ -42,7 +42,7 @@ services:
             - ./banner.png:/var/www/html/banner.png:ro
             {% endif %}
             #- /groups/XXX/:/groups/XXX/:ro  # We do this when we have symlinks in src_data pointing to /groups/XXX/...
-            {% if 'picture_path' is defined %}
+            {% if 'picture_path' is defined and 'picture_path' != None %}
                 {% if 'png' in picture_path %}
             - ./species.png:/var/www/html/species.png:ro
                 {% endif %}
diff --git a/utilities.py b/utilities.py
index 42d4162801697c4c6ae190194e0d6977b4178371..af7a5ea2b054f756db0cf8b10032bec43bd16209 100755
--- a/utilities.py
+++ b/utilities.py
@@ -179,11 +179,10 @@ def get_sp_picture(sp_dict_list):
         gspecies = get_gspecies_string_from_sp_dict(sp)
         if gspecies not in sp_picture_dict.keys() or ( constants.ORG_PARAM_DESC_MAIN_SPECIES in sp[constants.ORG_PARAM_DESC].keys() and
                                                            sp[constants.ORG_PARAM_DESC][constants.ORG_PARAM_DESC_MAIN_SPECIES] == True ):
-            sp_picture_dict[gspecies] = "" # default value
+            sp_picture_dict[gspecies] = ""
             if constants.ORG_PARAM_DESC_PICTURE_PATH in sp[constants.ORG_PARAM_DESC].keys() and \
                     sp[constants.ORG_PARAM_DESC][constants.ORG_PARAM_DESC_PICTURE_PATH] != "":
                 sp_picture_dict[gspecies] = sp[constants.ORG_PARAM_DESC][constants.ORG_PARAM_DESC_PICTURE_PATH]
-    logging.debug("Species picture dictionary: {0}".format(sp_picture_dict))
     return sp_picture_dict
 
 def run_tool(instance, tool_id, history_id, tool_inputs):