diff --git a/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java b/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
index b1ad19e69..306ebdd0e 100755
--- a/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
@@ -131,6 +131,12 @@ public class CommandLineGATK extends CommandLineExecutable {
         // can't close tribble index when writing
         if ( message.indexOf("Unable to close index for") != -1 )
             exitSystemWithUserError(new UserException(t.getCause().getMessage()));
+
+        // disk is full
+        if ( message.indexOf("No space left on device") != -1 )
+            exitSystemWithUserError(new UserException(t.getMessage()));
+        if ( t.getCause().getMessage().indexOf("No space left on device") != -1 )
+            exitSystemWithUserError(new UserException(t.getCause().getMessage()));
     }
 
     /**