diff --git a/api/src/org/labkey/api/exp/DomainDescriptor.java b/api/src/org/labkey/api/exp/DomainDescriptor.java
index 2a9e0b0aca6..e1a04b23b18 100644
--- a/api/src/org/labkey/api/exp/DomainDescriptor.java
+++ b/api/src/org/labkey/api/exp/DomainDescriptor.java
@@ -200,7 +200,7 @@ public String getDomainURI()
     public Container getProject()
     {
         var c = getContainer();
-        return null == c ? null : c.getProject();
+        return null == c ? null : (c.getProject() != null ? c.getProject() : c);
     }
 
     public int getTitlePropertyId()
diff --git a/api/src/org/labkey/api/exp/PropertyDescriptor.java b/api/src/org/labkey/api/exp/PropertyDescriptor.java
index 6f5884d1ef4..6150b0393f9 100644
--- a/api/src/org/labkey/api/exp/PropertyDescriptor.java
+++ b/api/src/org/labkey/api/exp/PropertyDescriptor.java
@@ -307,7 +307,7 @@ public void setContainer(Container container)
     public Container getProject()
     {
         var c = getContainer();
-        return null == c ? null : c.getProject();
+        return null == c ? null : (c.getProject() != null ? c.getProject() : c);
     }
 
     public void setProject(Container proj)
diff --git a/query/webapp/dataview/DataViewsPanel.js b/query/webapp/dataview/DataViewsPanel.js
index 3423abe2f5f..e57f97ea61f 100644
--- a/query/webapp/dataview/DataViewsPanel.js
+++ b/query/webapp/dataview/DataViewsPanel.js
@@ -510,9 +510,9 @@ Ext4.define('LABKEY.ext4.DataViewsPanel', {
                     handler.call(scope || this, json);
                 }
             },
-            failure : function() {
-                Ext4.Msg.alert('Failure');
-            },
+            failure : LABKEY.Utils.getCallbackWrapper(function(json) {
+                Ext4.Msg.alert('Get Configuration Failure', LABKEY.Utils.encodeHtml(json.exception));
+            }, null, true),
             scope : this
         });
     },
@@ -1403,9 +1403,9 @@ Ext4.define('LABKEY.ext4.DataViewsPanel', {
                                 else
                                     this.getFullStore().load();
                             },
-                            failure : function() {
-                                Ext4.Msg.alert('Failure');
-                            },
+                            failure : LABKEY.Utils.getCallbackWrapper(function(json) {
+                                Ext4.Msg.alert('Customize View Failure', LABKEY.Utils.encodeHtml(json.exception));
+                            }, null, true),
                             scope : this
                         });
                     }