diff --git a/java-checks-test-sources/default/src/main/java/checks/NPEThrowCheckSample.java b/java-checks-test-sources/default/src/main/java/checks/NPEThrowCheckSample.java
index 44e52d6da24..4aaf03c8d4a 100644
--- a/java-checks-test-sources/default/src/main/java/checks/NPEThrowCheckSample.java
+++ b/java-checks-test-sources/default/src/main/java/checks/NPEThrowCheckSample.java
@@ -1,18 +1,24 @@
 package checks;
 
 class NPEThrowCheckSample {
-  void foo() throws NullPointerException { // Noncompliant {{Throw some other exception here, such as "IllegalArgumentException".}}
+  void foo() throws NullPointerException { // Noncompliant {{Remove NullPointerException from the throws clause.}}
 //                  ^^^^^^^^^^^^^^^^^^^^
   }
   void bar() {
     throw new
-    NullPointerException // Noncompliant {{Throw some other exception here, such as "IllegalArgumentException".}}
+    NullPointerException // Noncompliant {{Use Objects.requireNonNull() instead of explicitly throwing NullPointerException.}}
     ();
   }
   void baz() {
-    throw new java.lang.NullPointerException(); // Noncompliant {{Throw some other exception here, such as "IllegalArgumentException".}}
+    throw new java.lang.NullPointerException(); // Noncompliant {{Use Objects.requireNonNull() instead of explicitly throwing NullPointerException.}}
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   }
+  void withMessage(Object o) {
+    throw new NullPointerException("o must not be null"); // Compliant, a message is provided
+  }
+  void withComputedMessage(String name) {
+    throw new java.lang.NullPointerException(name + " must not be null"); // Compliant
+  }
   void qix() throws IllegalArgumentException {
     throw new IllegalArgumentException();
   }
diff --git a/java-checks/src/main/java/org/sonar/java/checks/NPEThrowCheck.java b/java-checks/src/main/java/org/sonar/java/checks/NPEThrowCheck.java
index 07cc5da291e..8896c28c5ac 100644
--- a/java-checks/src/main/java/org/sonar/java/checks/NPEThrowCheck.java
+++ b/java-checks/src/main/java/org/sonar/java/checks/NPEThrowCheck.java
@@ -40,20 +40,27 @@ public List<Tree.Kind> nodesToVisit() {
   public void visitNode(Tree tree) {
     if (tree.is(Tree.Kind.THROW_STATEMENT)) {
       ExpressionTree expressionTree = ((ThrowStatementTree) tree).expression();
-      raiseIssueOnNpe(expressionTree, expressionTree.symbolType());
+      if (hasArguments(expressionTree)) {
+        return;
+      }
+      raiseIssueOnNpe(expressionTree, expressionTree.symbolType(), "Use Objects.requireNonNull() instead of explicitly throwing NullPointerException.");
     } else {
       for (TypeTree throwClause : ((MethodTree) tree).throwsClauses()) {
-        raiseIssueOnNpe(throwClause, throwClause.symbolType());
+        raiseIssueOnNpe(throwClause, throwClause.symbolType(), "Remove NullPointerException from the throws clause.");
       }
     }
   }
 
-  private void raiseIssueOnNpe(Tree tree, Type type) {
+  private void raiseIssueOnNpe(Tree tree, Type type, String message) {
     if (type.is("java.lang.NullPointerException")) {
-      reportIssue(treeAtFault(tree), "Throw some other exception here, such as \"IllegalArgumentException\".");
+      reportIssue(treeAtFault(tree), message);
     }
   }
 
+  private static boolean hasArguments(ExpressionTree expressionTree) {
+    return expressionTree.is(Tree.Kind.NEW_CLASS) && !((NewClassTree) expressionTree).arguments().isEmpty();
+  }
+
   private static Tree treeAtFault(Tree tree) {
     return tree.is(Tree.Kind.NEW_CLASS) ? ((NewClassTree) tree).identifier() : tree;
   }