diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/DindelGenotypeLikelihoodsCalculationModel.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/DindelGenotypeLikelihoodsCalculationModel.java
index 2e9da3595..3690ae8dc 100755
--- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/DindelGenotypeLikelihoodsCalculationModel.java
+++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/DindelGenotypeLikelihoodsCalculationModel.java
@@ -88,7 +88,8 @@ public class DindelGenotypeLikelihoodsCalculationModel extends GenotypeLikelihoo
         if (!vc.isIndel())
             return null;
 
-        if (sitesVisited.contains(new Integer(vc.getStart())))
+        if (sitesVisited.contains(new Integer(vc.getStart())) &&
+                contextType.equals(StratifiedAlignmentContext.StratifiedContextType.COMPLETE))
              return null;
 
         sitesVisited.add(new Integer(vc.getStart()));
diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java
index 84a4ffed7..c0d0c061c 100755
--- a/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java
+++ b/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java
@@ -177,7 +177,10 @@ public class UnifiedGenotyperEngine {
         Map<String, BiallelicGenotypeLikelihoods> GLs = new HashMap<String, BiallelicGenotypeLikelihoods>();
         Allele refAllele = glcm.get().getLikelihoods(tracker, refContext, stratifiedContexts, type, genotypePriors, GLs);
 
-        return createVariantContextFromLikelihoods(refContext, refAllele, GLs);
+        if (refAllele != null)
+            return createVariantContextFromLikelihoods(refContext, refAllele, GLs);
+        else
+            return null;
     }
 
     private VariantContext createVariantContextFromLikelihoods(ReferenceContext refContext, Allele refAllele, Map<String, BiallelicGenotypeLikelihoods> GLs) {