diff --git a/_states/jenkins_artifactory.py b/_states/jenkins_artifactory.py
index 63a63d6..dbd34d4 100644
--- a/_states/jenkins_artifactory.py
+++ b/_states/jenkins_artifactory.py
@@ -12,8 +12,8 @@
 if(server &&
    server.getName().equals("{name}") &&
    server.getUrl().equals("{serverUrl}") &&
-   server.getDeployerCredentialsConfig().getCredentialsId().equals("{credentialsId}") &&
-   server.getResolverCredentialsConfig().getCredentialsId().equals("{credentialsId}")){{
+   (server.getDeployerCredentialsConfig() == null || server.getDeployerCredentialsConfig().getCredentialsId().equals("{credentialsId}")) &&
+   (server.getResolverCredentialsConfig() == null || server.getResolverCredentialsConfig().getCredentialsId().equals("{credentialsId}"))){
         print("EXISTS")
 }}else{{
     // we must care about null here