diff --git a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java
index e9c3aeeab710..d031127bae4d 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java
@@ -251,8 +251,8 @@ public class DeleteHandler {
       //noinspection deprecation
       element.checkDelete();
     }
-    catch (IncorrectOperationException ex) {
-      Messages.showMessageDialog(project, ex.getMessage(), CommonBundle.getErrorTitle(), Messages.getErrorIcon());
+    catch (IncorrectOperationException e) {
+      Messages.showMessageDialog(project, e.getMessage(), CommonBundle.getErrorTitle(), Messages.getErrorIcon());
       return;
     }
 
@@ -260,9 +260,9 @@ public class DeleteHandler {
       try {
         element.delete();
       }
-      catch (IncorrectOperationException ex) {
+      catch (IncorrectOperationException e) {
         ApplicationManager.getApplication().invokeLater(
-          () -> Messages.showMessageDialog(project, ex.getMessage(), CommonBundle.getErrorTitle(), Messages.getErrorIcon()));
+          () -> Messages.showMessageDialog(project, e.getMessage(), CommonBundle.getErrorTitle(), Messages.getErrorIcon()));
       }
     });
   }
diff --git a/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java b/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
index 80547200f9ff..d050f660b8a2 100644
--- a/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
+++ b/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
@@ -100,8 +100,8 @@ public class FileUtilRt {
     private static Method ourPathToFileMethod;
     private static Method ourAttributesIsOtherMethod;
     private static Object ourDeletionVisitor;
-    private static Class ourNoSuchFileExceptionClass;
-    private static Class ourAccessDeniedExceptionClass;
+    private static Class<?> ourNoSuchFileExceptionClass;
+    private static Class<?> ourAccessDeniedExceptionClass;
 
     static {
       boolean initSuccess = false;
@@ -306,6 +306,7 @@ public class FileUtilRt {
     return result.toString();
   }
 
+  @SuppressWarnings("DuplicatedCode")
   private static int processRoot(@NotNull String path, @NotNull Appendable result) {
     try {
       if (SystemInfoRt.isWindows && path.length() > 1 && path.charAt(0) == '/' && path.charAt(1) == '/') {