diff --git a/plugins/devkit/devkit-core/src/build/PluginBuildConfiguration.java b/plugins/devkit/devkit-core/src/build/PluginBuildConfiguration.java
index c77da4e17952..3bdc070a9298 100644
--- a/plugins/devkit/devkit-core/src/build/PluginBuildConfiguration.java
+++ b/plugins/devkit/devkit-core/src/build/PluginBuildConfiguration.java
@@ -31,6 +31,7 @@ import org.jetbrains.idea.devkit.module.PluginDescriptorConstants;
 import org.jetbrains.idea.devkit.module.PluginModuleType;
 
 import java.io.File;
+import java.util.Objects;
 
 @State(name = "DevKit.ModuleBuildProperties")
 public class PluginBuildConfiguration implements PersistentStateComponent<PluginBuildConfiguration.State> {
@@ -68,8 +69,8 @@ public class PluginBuildConfiguration implements PersistentStateComponent<Plugin
 
       State state = (State)o;
 
-      if (url != null ? !url.equals(state.url) : state.url != null) return false;
-      if (manifest != null ? !manifest.equals(state.manifest) : state.manifest != null) return false;
+      if (!Objects.equals(url, state.url)) return false;
+      if (!Objects.equals(manifest, state.manifest)) return false;
 
       return true;
     }