diff --git a/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java b/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java
index dbf0eca54e..ba94119363 100644
--- a/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java
+++ b/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java
@@ -142,7 +142,7 @@ public QueryView createView(ViewContext context, QuerySettings settings, BindExc
         }
 
         QueryView ret = super.createView(context, settings, errors);
-        if (queryName.equalsIgnoreCase(TABLE_FEATURE_ANNOTATION))
+        if (ret != null && TABLE_FEATURE_ANNOTATION.equalsIgnoreCase(queryName))
         {
             // NOTE FeatureAnnotationSetQueryView handles this for TABLE_FEATURE_ANNOTATION_SET
             ret.setAllowableContainerFilterTypes(ContainerFilter.Type.CurrentPlusProjectAndShared);