diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java b/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
index 158ca104b80..de3c793c937 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/DefaultDiagnosticRenderer.java
@@ -17,15 +17,17 @@
 package org.jetbrains.jet.compiler;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.diagnostics.*;
+import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory;
+import org.jetbrains.jet.lang.diagnostics.Diagnostic;
+import org.jetbrains.jet.lang.diagnostics.Renderer;
 import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer;
 import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticWithParameters1Renderer;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.diagnostics.rendering.SimpleDiagnosticRenderer;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.jetbrains.jet.lang.diagnostics.Errors.EXCEPTION_WHILE_ANALYZING;
+import static org.jetbrains.jet.lang.diagnostics.Errors.*;
 
 /**
  * @author Evgeny Gerashchenko
@@ -37,7 +39,7 @@ public class DefaultDiagnosticRenderer implements DiagnosticRenderer<Diagnostic>
     private final Map<AbstractDiagnosticFactory, DiagnosticRenderer<?>> factoryToRenderer = new HashMap<AbstractDiagnosticFactory, DiagnosticRenderer<?>>();
 
     private DefaultDiagnosticRenderer() {
-        factoryToRenderer.put(EXCEPTION_WHILE_ANALYZING, new DiagnosticWithParameters1Renderer<JetFile, Throwable>("{0}", new Renderer<Throwable>() {
+        factoryToRenderer.put(EXCEPTION_WHILE_ANALYZING, new DiagnosticWithParameters1Renderer<Throwable>("{0}", new Renderer<Throwable>() {
             @NotNull
             @Override
             public String render(@NotNull Throwable e) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java
index 6ae1c64d191..6031bdeea45 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.lang.diagnostics.rendering;
 
-import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
 import org.jetbrains.jet.lang.diagnostics.Renderer;
@@ -27,7 +26,7 @@ import java.text.MessageFormat;
 * @author Evgeny Gerashchenko
 * @since 4/12/12
 */
-public class DiagnosticWithParameters1Renderer<E extends PsiElement, A> implements DiagnosticRenderer<DiagnosticWithParameters1<E, A>> {
+public class DiagnosticWithParameters1Renderer<A> implements DiagnosticRenderer<DiagnosticWithParameters1<?, A>> {
     private final MessageFormat messageFormat;
     private final Renderer<? super A> rendererForA;
 
@@ -38,7 +37,7 @@ public class DiagnosticWithParameters1Renderer<E extends PsiElement, A> implemen
 
     @NotNull
     @Override
-    public String render(@NotNull DiagnosticWithParameters1<E, A> diagnostic) {
+    public String render(@NotNull DiagnosticWithParameters1<?, A> diagnostic) {
         return messageFormat.format(new Object[]{rendererForA.render(diagnostic.getA())});
     }
 }