diff --git a/protected/gatk-tools-protected/src/main/java/org/broadinstitute/gatk/tools/walkers/variantutils/GenotypeGVCFs.java b/protected/gatk-tools-protected/src/main/java/org/broadinstitute/gatk/tools/walkers/variantutils/GenotypeGVCFs.java
index 1e4d7223e..2fdc0f5af 100644
--- a/protected/gatk-tools-protected/src/main/java/org/broadinstitute/gatk/tools/walkers/variantutils/GenotypeGVCFs.java
+++ b/protected/gatk-tools-protected/src/main/java/org/broadinstitute/gatk/tools/walkers/variantutils/GenotypeGVCFs.java
@@ -219,11 +219,14 @@ public class GenotypeGVCFs extends RodWalker<VariantContext, VariantContextWrite
         // only re-genotype polymorphic sites
         if ( result.isVariant() ) {
             VariantContext regenotypedVC = genotypingEngine.calculateGenotypes(result);
-            if ( regenotypedVC == null )
-                return null;
-
-            regenotypedVC = GATKVariantContextUtils.reverseTrimAlleles(regenotypedVC);
-            result = addGenotypingAnnotations(originalVC.getAttributes(), regenotypedVC);
+            if ( regenotypedVC == null) {
+                if (!INCLUDE_NON_VARIANTS)
+                    return null;
+            }
+            else {
+                regenotypedVC = GATKVariantContextUtils.reverseTrimAlleles(regenotypedVC);
+                result = addGenotypingAnnotations(originalVC.getAttributes(), regenotypedVC);
+            }
         }
 
         // if it turned monomorphic then we either need to ignore or fix such sites