diff --git a/_states/jenkins_node.py b/_states/jenkins_node.py
index 388c9fb..c8afacc 100644
--- a/_states/jenkins_node.py
+++ b/_states/jenkins_node.py
@@ -131,13 +131,13 @@
         call_result = __salt__['jenkins_common.call_groovy_script'](
             create_node_groovy,
             {"name": name,
-                "desc": desc,
-                "label": label_string,
-                "remote_home": remote_home,
-                "num_executors": num_executors,
+                "desc": desc if desc else "",
+                "label": label_string if label_string else "",
+                "remote_home": remote_home if remote_home else "",
+                "num_executors": num_executors if num_executors else "1",
                 "launcher": launcher_string,
                 "node_mode": node_mode.upper(),
-                "ret_strategy": ret_strategy})
+                "ret_strategy": ret_strategy if ret_strategy else "Always"})
         if call_result["code"] == 200 and call_result["msg"] in ["CREATED", "EXISTS"]:
             status = call_result["msg"]
             if call_result["msg"] == "CREATED":
diff --git a/_states/jenkins_security.py b/_states/jenkins_security.py
index 299c974..d9d411f 100644
--- a/_states/jenkins_security.py
+++ b/_states/jenkins_security.py
@@ -74,7 +74,12 @@
     else:
         call_result = __salt__['jenkins_common.call_groovy_script'](
             set_ldap_groovy, {"name": name, "server": server, "rootDN": root_dn,
-                              "userSearchBase": user_search_base, "managerDN": manager_dn, "managerPassword": manager_password, "userSearch": user_search if user_search else "", "groupSearchBase": group_search_base if group_search_base else "", "inhibitInferRootDN": "true" if inhibit_infer_root_dn else "false"})
+                              "userSearchBase": user_search_base if user_search_base else "",
+                              "managerDN": manager_dn if manager_dn else "",
+                              "managerPassword": manager_password if manager_password else "",
+                              "userSearch": user_search if user_search else "",
+                              "groupSearchBase": group_search_base if group_search_base else "", 
+                              "inhibitInferRootDN": "true" if inhibit_infer_root_dn else "false"})
         if call_result["code"] == 200 and call_result["msg"] == "SUCCESS":
             status = call_result["msg"]
             ret['changes'][name] = status