diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseLocusWindows.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseLocusWindows.java
index 5e924f93d..91ab0b34b 100755
--- a/java/src/org/broadinstitute/sting/gatk/traversals/TraverseLocusWindows.java
+++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraverseLocusWindows.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
- * User: amckenna
+ * User: ebanks
  * Date: Apr 23, 2009
  * Time: 10:26:03 AM
  * To change this template use File | Settings | File Templates.
diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/GATKPaperGenotyper.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/GATKPaperGenotyper.java
index 6219a0a13..a369086c3 100644
--- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/GATKPaperGenotyper.java
+++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/GATKPaperGenotyper.java
@@ -6,20 +6,19 @@ import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
 import org.broadinstitute.sting.gatk.walkers.LocusWalker;
 import org.broadinstitute.sting.gatk.walkers.TreeReducible;
 import org.broadinstitute.sting.gatk.walkers.genotyper.DiploidGenotypePriors;
-import org.broadinstitute.sting.utils.pileup.ReadBackedPileup;
 import org.broadinstitute.sting.utils.Utils;
 import org.broadinstitute.sting.utils.cmdLine.Argument;
+import org.broadinstitute.sting.utils.pileup.ReadBackedPileup;
 
-import java.io.PrintWriter;
+import java.io.PrintStream;
 
 
 /**
  * @author aaron
- *         <p/>
- *         Class GATKPaperGenotyper
- *         <p/>
- *         A simple Bayesian genotyper, that output a text based call format. Intended to be used only as an
- *         example in the GATK publication.
+ * A simple Bayesian genotyper, that output a text based call format. Intended to be used only as an
+ * example in the GATK publication.
+ *
+ * @help.description A simple, naive Bayesian genotyper that is used as an example locus walker in the GATK paper. THIS IS NOT TO BE USED FOR ANY ANALYSIS
  */
 public class GATKPaperGenotyper extends LocusWalker<SimpleCall, Integer> implements TreeReducible<Integer> {
 
@@ -28,7 +27,7 @@ public class GATKPaperGenotyper extends LocusWalker<SimpleCall, Integer> impleme
 
     // where to write the genotyping data to
     @Argument(fullName = "call_location", shortName = "cl", doc = "File to which calls should be written", required = true)
-    public PrintWriter outputStream;
+    public PrintStream outputStream;
 
     /**
      * our map function, which takes the reads spanning this locus, any associated reference ordered data,
@@ -90,7 +89,7 @@ public class GATKPaperGenotyper extends LocusWalker<SimpleCall, Integer> impleme
      * @return accumulator with result of the map taken into account.
      */
     public Integer reduce(SimpleCall value, Integer sum) {
-        outputStream.println(value.toString());
+        if (value != null) outputStream.println(value.toString());
         return sum + 1;
     }
 
diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/package-info.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/package-info.java
new file mode 100644
index 000000000..f3d262f99
--- /dev/null
+++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/papergenotyper/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * @help.display.name The GATK paper's Bayesian genotyper
+ */
+package org.broadinstitute.sting.playground.gatk.walkers.papergenotyper;
\ No newline at end of file