diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java b/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java
index 517ad2cd..e2ae6b69 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/core/ErrorReportSubmitterImpl.java
@@ -20,34 +20,25 @@
 package org.jetbrains.plugins.spotbugs.core;
 
 import com.intellij.ide.BrowserUtil;
-import com.intellij.openapi.diagnostic.ErrorReportSubmitter;
-import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.diagnostic.SubmittedReportInfo;
+import com.intellij.openapi.diagnostic.*;
 import com.intellij.openapi.ide.CopyPasteManager;
-import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.progress.*;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Consumer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.*;
 import org.jetbrains.plugins.spotbugs.actions.HelpAction;
 import org.jetbrains.plugins.spotbugs.common.VersionManager;
-import org.jetbrains.plugins.spotbugs.common.util.ErrorUtil;
-import org.jetbrains.plugins.spotbugs.common.util.FindBugsUtil;
-import org.jetbrains.plugins.spotbugs.common.util.New;
+import org.jetbrains.plugins.spotbugs.common.util.*;
 import org.jetbrains.plugins.spotbugs.resources.ResourcesLoader;
 
-import java.awt.Component;
+import java.awt.*;
 import java.awt.datatransfer.StringSelection;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class ErrorReportSubmitterImpl extends ErrorReportSubmitter {
@@ -124,7 +115,7 @@ private SubmittedReportInfo submitImpl(
 		if (errors.isEmpty()) {
 			throw new IllegalStateException("No error to report");
 		}
-		final List<Error> sorted = new ArrayList<Error>(errors);
+		final List<Error> sorted = new ArrayList<>(errors);
 		Collections.sort(sorted);
 
 		for (final Error error : sorted) {
@@ -151,14 +142,12 @@ private SubmittedReportInfo openBrowser(
 
 		final String baseUrl;
 		if (isFindBugsError) {
-			// http://sourceforge.net/p/findbugs/bugs/
-			// is locked - assume we should report on github - 19.9.2015
-			baseUrl = "https://github.com/findbugsproject/findbugs/issues";
+			baseUrl = "https://github.com/spotbugs/spotbugs/issues/";
 		} else {
-			baseUrl = "https://github.com/andrepdo/findbugs-idea/issues";
+			baseUrl = "https://github.com/JetBrains/spotbugs-intellij-plugin/issues";
 		}
 
-		/**
+		/*
 		 * Note: set errorText as body does not work:
 		 *   - can cause HTTP 414 Request URI too long
 		 *   - if user is not yet logged in github login page will show an error
@@ -174,11 +163,7 @@ private SubmittedReportInfo openBrowser(
 
 	@NotNull
 	private static String encode(@NotNull final String value) {
-		try {
-			return URLEncoder.encode(value, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw ErrorUtil.toUnchecked(e); // all system support UTF-8
-		}
+		return URLEncoder.encode(value, StandardCharsets.UTF_8);
 	}
 
 	@NotNull
diff --git a/src/main/java/org/jetbrains/plugins/spotbugs/gui/intentions/GroupBugIntentionListPopupStep.java b/src/main/java/org/jetbrains/plugins/spotbugs/gui/intentions/GroupBugIntentionListPopupStep.java
index 3b7fd651..9cbaad88 100644
--- a/src/main/java/org/jetbrains/plugins/spotbugs/gui/intentions/GroupBugIntentionListPopupStep.java
+++ b/src/main/java/org/jetbrains/plugins/spotbugs/gui/intentions/GroupBugIntentionListPopupStep.java
@@ -45,7 +45,7 @@ public class GroupBugIntentionListPopupStep extends BaseListPopupStep<SuppressRe
 	public GroupBugIntentionListPopupStep(final PsiElement psiElement, final List<SuppressReportBugIntentionAction> intentionActions) {
 		super(intentionActions.get(0).getText(), intentionActions);
 		_psiElement = psiElement;
-		_intentionActions = new ArrayList<SuppressReportBugIntentionAction>(intentionActions);
+		_intentionActions = new ArrayList<>(intentionActions);
 	}
 
 
@@ -63,7 +63,7 @@ public PopupStep<?> onChosen(final SuppressReportBugIntentionAction selectedValu
 		new WriteCommandAction.Simple/*<Object>*/(project, "Add findbugs-idea Suppress warning", _psiElement.getContainingFile()) {
 
 			@Override
-			protected void run() throws Throwable {
+			protected void run() {
 				final Editor editor = FileEditorManager.getInstance(project).getSelectedTextEditor();
 				selectedValue.invoke(project, editor, _psiElement);
 			}