diff --git a/etemplate/js/et2_dataview_view_grid.js b/etemplate/js/et2_dataview_view_grid.js
index 63cb42c62e..f3c0f45570 100644
--- a/etemplate/js/et2_dataview_view_grid.js
+++ b/etemplate/js/et2_dataview_view_grid.js
@@ -18,6 +18,9 @@
 
 	et2_dataview_interfaces;
 	et2_dataview_view_partitionTree;
+	et2_dataview_view_row;
+	et2_dataview_view_spacer;
+	et2_dataview_view_rowProvider;
 */
 
 /**
diff --git a/etemplate/js/et2_dataview_view_row.js b/etemplate/js/et2_dataview_view_row.js
index fc0c59626b..8a3f02753f 100644
--- a/etemplate/js/et2_dataview_view_row.js
+++ b/etemplate/js/et2_dataview_view_row.js
@@ -14,6 +14,7 @@
 
 /*egw:uses
 	et2_dataview_interfaces;
+	et2_dataview_view_container;
 */
 
 var et2_dataview_row = et2_dataview_container.extend(et2_dataview_IDataRow, {
diff --git a/etemplate/js/et2_dataview_view_rowProvider.js b/etemplate/js/et2_dataview_view_rowProvider.js
index 3e3dcfb6c6..afd563bced 100644
--- a/etemplate/js/et2_dataview_view_rowProvider.js
+++ b/etemplate/js/et2_dataview_view_rowProvider.js
@@ -214,7 +214,7 @@ var et2_dataview_rowProvider = Class.extend({
 			{
 				var node = entry.widget.getDOMNode(entry.widget);
 
-				if (node.parentNode)
+				if (node && node.parentNode)
 				{
 					// Get the parent node and replace the node with a placeholder
 					entry.placeholder = document.createElement("span");
diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 3ea50d1b49..8e8824afe8 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -23,6 +23,7 @@
 	et2_extension_nextmatch_dynheight;
 	et2_dataview_view_gridContainer;
 	et2_dataview_model_dataProvider;
+	et2_dataview_model_columns;
 */
 
 /**