diff --git a/_grains/jenkins_plugins.py b/_grains/jenkins_plugins.py
index 5d16d52..f5f90dc 100644
--- a/_grains/jenkins_plugins.py
+++ b/_grains/jenkins_plugins.py
@@ -13,9 +13,17 @@
 
     output = { "jenkins_plugins" : {} }
     opts = salt.config.minion_config('/etc/salt/minion')
-    user = opts['jenkins']['user']
-    password = opts['jenkins']['password']
-    url = opts['jenkins']['url']
+    try:
+        url = opts['jenkins']['url']
+    except KeyError:
+        return {}
+
+    try:
+        user = opts['jenkins']['user']
+        password = opts['jenkins']['password']
+    except KeyError:
+        user = None
+        password = None
 
     server = jenkins.Jenkins(url, username=user, password=password)
     plugins = server.get_plugins(depth=1)
diff --git a/_states/jenkins_job.py b/_states/jenkins_job.py
index 413908d..6f72d9d 100644
--- a/_states/jenkins_job.py
+++ b/_states/jenkins_job.py
@@ -87,7 +87,7 @@
                     ET.tostringlist(newXML, encoding='utf8', method='xml'), lineterm='')
                 __salt__['jenkins.update_job'](name, config, __env__)
                 ret['changes'][name] = ''.join(diff)
-                ret['comment'] = 'Job {0} updated.'.format(name)
+                ret['comment'].append('Job {0} updated.'.format(name))
 
         else:
             cached_source_path = __salt__['cp.cache_file'](config, __env__)