diff --git a/plugin/src/main/java/git4idea/GitUtil.java b/plugin/src/main/java/git4idea/GitUtil.java
index 9ee7370..ae09c69 100644
--- a/plugin/src/main/java/git4idea/GitUtil.java
+++ b/plugin/src/main/java/git4idea/GitUtil.java
@@ -1019,7 +1019,7 @@ public static void showPathsInDialog(
     ) {
         DialogBuilder builder = new DialogBuilder(project);
         builder.setCenterPanel(new GitSimplePathsBrowser(project, absolutePaths));
-        if (description != LocalizeValue.empty()) {
+        if (description.isNotEmpty()) {
             builder.setNorthPanel(new MultiLineLabel(description.get()));
         }
         builder.addOkAction();
diff --git a/plugin/src/main/java/git4idea/branch/GitBranchUiHandlerImpl.java b/plugin/src/main/java/git4idea/branch/GitBranchUiHandlerImpl.java
index 5f3f5a1..ddb559c 100644
--- a/plugin/src/main/java/git4idea/branch/GitBranchUiHandlerImpl.java
+++ b/plugin/src/main/java/git4idea/branch/GitBranchUiHandlerImpl.java
@@ -72,7 +72,7 @@ public boolean notifyErrorWithRollbackProposal(
         AtomicBoolean ok = new AtomicBoolean();
         UIUtil.invokeAndWaitIfNeeded((Runnable) () -> {
             StringBuilder description = new StringBuilder();
-            if (message != LocalizeValue.empty()) {
+            if (message.isNotEmpty()) {
                 description.append(message).append("<br/>");
             }
             description.append(rollbackProposal);
diff --git a/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java b/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java
index 4dc90cf..435c386 100644
--- a/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java
+++ b/plugin/src/main/java/git4idea/commands/GitHandlerUtil.java
@@ -175,7 +175,7 @@ public static void runInCurrentThread(
             () -> {
                 if (indicator != null) {
                     indicator.setTextValue(
-                        operationName == LocalizeValue.empty()
+                        operationName.isEmpty()
                             ? GitLocalize.gitRunning(handler.printableCommandLine())
                             : operationName
                     );
diff --git a/plugin/src/main/java/git4idea/push/GitDefineRemoteDialog.java b/plugin/src/main/java/git4idea/push/GitDefineRemoteDialog.java
index 3aba77a..2bf3d91 100644
--- a/plugin/src/main/java/git4idea/push/GitDefineRemoteDialog.java
+++ b/plugin/src/main/java/git4idea/push/GitDefineRemoteDialog.java
@@ -96,7 +96,7 @@ public JComponent getPreferredFocusedComponent() {
     @RequiredUIAccess
     protected void doOKAction() {
         LocalizeValue error = validateRemoteUnderModal(getRemoteName(), getRemoteUrl());
-        if (error != LocalizeValue.empty()) {
+        if (error.isNotEmpty()) {
             Messages.showErrorDialog(myRepository.getProject(), error.get(), "Invalid Remote");
         }
         else {
diff --git a/plugin/src/main/java/git4idea/update/GitFetcher.java b/plugin/src/main/java/git4idea/update/GitFetcher.java
index 59d5839..0a87212 100644
--- a/plugin/src/main/java/git4idea/update/GitFetcher.java
+++ b/plugin/src/main/java/git4idea/update/GitFetcher.java
@@ -344,7 +344,7 @@ public boolean fetchRootsAndNotify(
             LOG.info("fetching " + repository);
             GitFetchResult result = fetch(repository);
             LocalizeValue ai = result.getAdditionalInfo();
-            if (ai != LocalizeValue.empty()) {
+            if (ai.isNotEmpty()) {
                 additionalInfo.put(repository.getRoot(), ai.get());
             }
             if (!result.isSuccess()) {
diff --git a/plugin/src/main/java/git4idea/util/GitUIUtil.java b/plugin/src/main/java/git4idea/util/GitUIUtil.java
index ed02f9b..a1c8d4a 100644
--- a/plugin/src/main/java/git4idea/util/GitUIUtil.java
+++ b/plugin/src/main/java/git4idea/util/GitUIUtil.java
@@ -141,7 +141,7 @@ public static void notifyGitErrors(
         Collection<VcsException> gitErrors
     ) {
         StringBuilder content = new StringBuilder();
-        if (description != LocalizeValue.empty()) {
+        if (description.isNotEmpty()) {
             content.append(description);
         }
         if (!gitErrors.isEmpty()) {
diff --git a/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java b/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java
index 090adc8..1c99939 100644
--- a/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java
+++ b/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java
@@ -71,7 +71,7 @@ public static void notifyUntrackedFilesOverwrittenBy(
         NotificationService.getInstance().newError(VcsNotifier.IMPORTANT_ERROR_NOTIFICATION)
             .title(LocalizeValue.localizeTODO(operation.capitalize() + " failed"))
             .content(
-                description == LocalizeValue.empty()
+                description.isEmpty()
                     ? createUntrackedFilesOverwrittenDescription(operation, true)
                     : description
             )