diff --git a/netrender/client.py b/netrender/client.py
index 1a4334e9d3c9ca8dff460443c292fe594733cf31..3cb0b4372f23d91b1b9dcde0f01f202ac942d6db 100644
--- a/netrender/client.py
+++ b/netrender/client.py
@@ -105,7 +105,8 @@ def fillCommonJobSettings(job, job_name, netsettings):
     else:
         job.render = netsettings.job_render_engine
         
-    job.tags.update(netsettings.job_tags.split(";"))
+    if netsettings.job_tags:
+        job.tags.update(netsettings.job_tags.split(";"))
      
     if netsettings.job_type == "JOB_BLENDER":
         job.type = netrender.model.JOB_BLENDER