diff --git a/plugins/coverage/src/com/intellij/coverage/JavaCoverageAnnotator.java b/plugins/coverage/src/com/intellij/coverage/JavaCoverageAnnotator.java
index 3854a7994253..a89be556e796 100644
--- a/plugins/coverage/src/com/intellij/coverage/JavaCoverageAnnotator.java
+++ b/plugins/coverage/src/com/intellij/coverage/JavaCoverageAnnotator.java
@@ -232,7 +232,8 @@ public class JavaCoverageAnnotator extends BaseCoverageAnnotator {
   }
 
   private static String getPercentage(int covered, int total) {
-    return (int)((double)covered /total * 100) +"% (" + covered + "/" + total + ")";
+    final int percentage = total == 0 ? 100 : (int)((double)covered / total * 100);
+    return percentage + "% (" + covered + "/" + total + ")";
   }
 
   public static PackageAnnotator.SummaryCoverageInfo merge(@Nullable final PackageAnnotator.SummaryCoverageInfo info,
diff --git a/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java b/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java
index df0951539d8f..1a6a1f15f5d3 100644
--- a/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java
+++ b/plugins/coverage/src/com/intellij/coverage/PackageAnnotator.java
@@ -470,7 +470,7 @@ public class PackageAnnotator {
 
     classCoverageInfo.totalMethodCount += toplevelClassCoverageInfo.totalMethodCount;
     classCoverageInfo.coveredMethodCount += toplevelClassCoverageInfo.coveredMethodCount;
-    if (toplevelClassCoverageInfo.coveredMethodCount > 0) {
+    if (toplevelClassCoverageInfo.getCoveredLineCount() > 0) {
       classCoverageInfo.coveredClassCount++;
     }
   }