diff --git a/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java b/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
index ce57d1a7a..1b41b85f4 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
@@ -137,6 +137,10 @@ public class CommandLineGATK extends CommandLineExecutable {
             exitSystemWithUserError(new UserException.NoSpaceOnDevice());
         if ( t.getCause() != null && t.getCause().getMessage().contains("No space left on device") )
             exitSystemWithUserError(new UserException.NoSpaceOnDevice());
+
+        // masked out of memory error
+        if ( t.getCause() != null && t.getCause() instanceof OutOfMemoryError )
+            exitSystemWithUserError(new UserException.NotEnoughMemory());
     }
 
     /**
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/targets/DiagnoseTargets.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/targets/DiagnoseTargets.java
index 112eb278e..cbd3bc950 100644
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/targets/DiagnoseTargets.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/targets/DiagnoseTargets.java
@@ -246,6 +246,14 @@ public class DiagnoseTargets extends LocusWalker<Long, Long> {
      */
     private void addNewOverlappingIntervals(GenomeLoc refLocus) {
         GenomeLoc interval = intervalListIterator.peek();
+
+        // skip any intervals with no coverage that we have passed
+        while (interval != null && interval.isBefore(refLocus)) {
+            intervalListIterator.next();                                                                                // discard the interval (we've already added it to the map)
+            interval = intervalListIterator.peek();
+        }
+
+        // add any intervals that overlap this one
         while (interval != null && !interval.isPast(refLocus)) {
             intervalMap.put(interval, createIntervalStatistic(interval));
             intervalListIterator.next();                                                                                // discard the interval (we've already added it to the map)
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java
index 12423595b..d3ee4e832 100644
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java
@@ -94,8 +94,10 @@ public class ErrorThrowing extends RodWalker<Integer,Integer> implements TreeRed
             throw new RuntimeException(CommandLineGATK.PICARD_TEXT_SAM_FILE_ERROR_1);
         } else if ( exceptionToThrow.equals("SamError2") ) {
             throw new RuntimeException(CommandLineGATK.PICARD_TEXT_SAM_FILE_ERROR_2);
-        } else if ( exceptionToThrow.equals("NoSpace") ) {
+        } else if ( exceptionToThrow.equals("NoSpace1") ) {
             throw new net.sf.samtools.util.RuntimeIOException(new java.io.IOException("No space left on device java.io.FileOutputStream.writeBytes(Native Method)"));
+        } else if ( exceptionToThrow.equals("NoSpace2") ) {
+            throw new net.sf.samtools.SAMException("Exception writing BAM index file", new java.io.IOException("No space left on device java.io.FileOutputStream.writeBytes(Native Method)"));
         } else {
             throw new UserException.BadArgumentValue("exception", "exception isn't a recognized value " + exceptionToThrow);
         }
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/ForumAPIUtils.java b/public/java/src/org/broadinstitute/sting/utils/help/ForumAPIUtils.java
index 1dfc4ecc0..fe5f48a48 100644
--- a/public/java/src/org/broadinstitute/sting/utils/help/ForumAPIUtils.java
+++ b/public/java/src/org/broadinstitute/sting/utils/help/ForumAPIUtils.java
@@ -44,7 +44,7 @@ public class ForumAPIUtils {
     /**
      * How we post to the forum
      */
-    private final static String API_URL = "https://gatk.vanillaforums.com/";
+    private final static String API_URL = "https://gatkforums.broadinstitute.org/api/v1/";
     final private static String ACCESS_TOKEN = "access_token=";
 
     public static List<String> getPostedTools(String forumKey) {